knife-kvm 0.1.1 → 0.1.2

data/knife-kvm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", ">= 1.1.1"
+  s.add_dependency "fog", ">= 1.1.2"
   s.add_dependency "terminal-table"
   s.add_dependency "alchemist"
   s.add_dependency "chef", ">= 0.10"

data/lib/chef/knife/kvm_base.rb

@@ -55,6 +55,11 @@ class Chef
             :description => "Your KVM host address",
             :default => "127.0.0.1",
             :proc => Proc.new { |host| Chef::Config[:knife][:kvm_host] = host }
+          
+          option :libvirt_protocol,
+            :long => "--libvirt-protocol PROTO",
+            :description => "Libvirt connection protocol (default SSH)",
+            :default => "ssh"
         end
       end
 
@@ -64,13 +69,8 @@ class Chef
           host = Chef::Config[:knife][:kvm_host] || '127.0.0.1'
           username = Chef::Config[:knife][:kvm_username] 
           password = Chef::Config[:knife][:kvm_password]
-          libvirt_uri = ''
-          if host == "127.0.0.1"
-            libvirt_uri = "qemu+unix:///system"
-          else
-            libvirt_uri = "qemu+ssh://#{username}@#{host}/system"
-          end
-          ui.info "#{ui.color("Connecting to KVM host #{config[:kvm_host]}... ", :magenta)}"
+          libvirt_uri = "qemu+#{config[:libvirt_protocol]}://#{username}@#{host}/system"
+          ui.info "#{ui.color("Connecting to KVM host #{config[:kvm_host]} (#{config[:libvirt_protocol]})... ", :magenta)}"
           @connection = ::Fog::Compute.new :provider => 'libvirt',
                                          :libvirt_uri => libvirt_uri,
                                          :libvirt_ip_command => "virt-cat -d $server_name /tmp/ip-info 2> /dev/null |grep -v 127.0.0.1"

data/lib/chef/knife/kvm_vm_create.rb

@@ -26,6 +26,7 @@ class Chef
 
       deps do
         require 'readline'
+        require 'alchemist'
         require 'chef/json_compat'
         require 'chef/knife/bootstrap'
         Chef::Knife::Bootstrap.load_deps
@@ -35,7 +36,7 @@ class Chef
 
       option :vm_disk,
         :long => "--vm-disk FILE",
-        :description => "The path to the VMDK disk file"
+        :description => "The path to the QCOW2 disk file"
 
       option :vm_name,
         :long => "--vm-name NAME",
@@ -142,12 +143,12 @@ class Chef
         $stdout.sync = true
 
         unless config[:vm_disk]
-          ui.error("You have not provided a valid VMDK file. (--vm-disk)")
+          ui.error("You have not provided a valid QCOW2 file. (--vm-disk)")
           exit 1
         end
         
         if not File.exist?(config[:vm_disk])
-          ui.error("Invalid VMDK disk file (--vm-disk)")
+          ui.error("Invalid QCOW2 disk file (--vm-disk)")
           exit 1
         end
         
@@ -173,6 +174,7 @@ class Chef
                           #:autostart => true, # Starting guest automatically
                           :volume_pool_name => pool,
                           :network_interface_type => net_type,
+                          :memory_size => memory.to_i * 1024,
                           :network_bridge_name => net_if
 
         puts "#{ui.color("Importing VM disk... ", :magenta)}"
@@ -180,7 +182,7 @@ class Chef
         vm.start
         
         puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
-        puts "#{ui.color("VM Memory", :cyan)}: #{(vm.memory_size.to_f/1024/1024).round} MB"
+        puts "#{ui.color("VM Memory", :cyan)}: #{vm.memory_size.to_i.kilobytes.to.megabytes.round} MB"
 
         # wait for it to be ready to do stuff
         print "\n#{ui.color("Waiting server... ", :magenta)}"

data/lib/chef/knife/kvm_vm_list.rb

@@ -31,7 +31,7 @@ class Chef
         vm_table = table do |t|
           t.headings = %w{NAME STATE MAX_MEM CPUS OS_TYPE ARCH}
           connection.servers.each do |vm|
-            t << [vm.name, vm.state, "#{vm.max_memory_size.to_i.kilobytes.to.megabytes.round} MB", vm.cpus, vm.os_type, vm.arch]
+            t << [vm.name, vm.state, "#{vm.memory_size.to_i.kilobytes.to.megabytes.round} MB", vm.cpus, vm.os_type, vm.arch]
           end
         end
         puts vm_table

data/lib/knife-kvm/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module KVM 
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-kvm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &12162280 !ruby/object:Gem::Requirement
+  requirement: &12118620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *12162280
+  version_requirements: *12118620
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &12161860 !ruby/object:Gem::Requirement
+  requirement: &12118200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12161860
+  version_requirements: *12118200
 - !ruby/object:Gem::Dependency
   name: alchemist
-  requirement: &12161400 !ruby/object:Gem::Requirement
+  requirement: &12117740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12161400
+  version_requirements: *12117740
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &12160900 !ruby/object:Gem::Requirement
+  requirement: &12117180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0.10'
   type: :runtime
   prerelease: false
-  version_requirements: *12160900
+  version_requirements: *12117180
 description: KVM Support for Chef's Knife Command
 email:
 - rubiojr@frameos.org
@@ -100,7 +100,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: KVM Support for Chef's Knife Command
-test_files:
-- features/kvm.feature
-- features/step_definitions/steps.rb
-- features/support/env.rb
+test_files: []