knife-proxmox 0.0.15 → 0.0.16

data/README

@@ -30,8 +30,31 @@ Id   Node    Name                 Type    Status
 202  node-2  chef-client1         openvz  down 
 
 Get info for a server
-$ knife proxmox server info -H tetatet.example.com -F ipaddress
-
+$ knife proxmox server info -H tetatet.example.com -P ip
+192.168.1.1
+
+$ knife proxmox server info -H tetatet.example.com
+knife proxmox server info -H tetatet.example.com -P ip
+cpu:       0.00281876923420022
+cpus:      2
+disk:      5833015296
+diskread:  316895232
+diskwrite: 3805184
+failcnt:   0
+ha:        0
+ip:        192.168.42.200
+maxdisk:   8589934592
+maxmem:    4294967296
+maxswap:   536870912
+mem:       1145778176
+name:      tetatet.example.com
+netin:     27888604
+netout:    2829601
+nproc:     140
+status:    running
+swap:      54460416
+type:      openvz
+uptime:    61018
 
 
 List templates installed
@@ -56,7 +79,8 @@ debian-6-turnkey-tomcat-apache_12.0-1_i386.tar.gz          debian-6
 debian-6.0-wordpress_3.4.2-1_i386.tar.gz                   debian-6.0 .....
 
 
-Create a server
+Create a server (read the note at the end of the document.  It's about obtaining the IPAddress)
+
 $  knife proxmox server create -n ankh -r "recipe[java]" -C 2 -M 1024 -H example-server -P test123 -T 4
 Creating VM 473...
 ..............OK
@@ -131,3 +155,9 @@ If you want to alter some variable by command line then you can use the followin
 -u --username <user>   Same for user
 -p --password <pass>   Same for password
 -r --realm    <realm>  Same for the realm used to authenticate
+
+ABOUT CHEF AND PROXMOX
+
+To bootstrap a newly created VM, you should apply the patch inside the extra directory.  Otherwise you must
+specify the IP address in the knife proxmox server create --ipaddress argument.
+

data/lib/chef/knife/proxmox_base.rb

@@ -19,6 +19,9 @@ class Chef
             require 'net/ssh/multi'
             require 'chef/api_client'
             require 'chef/node'
+            require 'readline'
+            require 'chef/knife/bootstrap'
+            Chef::Knife::Bootstrap.load_deps
           end
           
           # options
@@ -106,7 +109,7 @@ class Chef
           data.each {|entry|
             vmids.add entry['vmid']
           }
-          (vmids.max + 1).to_s
+          (vmids.empty? ? 100 : (vmids.max + 1)).to_s
         end
       end
 
@@ -141,13 +144,17 @@ class Chef
         end
       end
       
-      # vmid_to_node: Specify the vmid and get the node in which is
+      # vmid_to_node: Specify the vmid and get the node in which is. nil otherwise
       def vmid_to_node(vmid)
+        node = nil
         @connection['cluster/resources?type=vm'].get @auth_params do |response, request, result, &block|
           data = JSON.parse(response.body)['data']
           data.each {|entry|
-            return entry['node'] if entry['vmid'].to_s.match(vmid.to_s)
+            if entry['vmid'].to_s.match(vmid.to_s) then
+              node = entry['node'] 
+            end
           }
+          return node
         end
       end
       
@@ -201,6 +208,9 @@ class Chef
           # take the response and extract the taskid
           action_response("server stop",response)
         end
+        rescue Exception => e
+          ui.warn("The VMID does not match any node")
+          exit 1
       end
       
       def server_create(vmid,vm_definition)

data/lib/chef/knife/proxmox_server_destroy.rb

@@ -43,10 +43,15 @@ class Chef
           vm_id = config[:vm_id]
         end
         
-        server_stop(vm_id)
-        ui.msg("Preparing the server to delete")
-        sleep(5)
-        server_destroy(vm_id)
+        begin
+          server_stop(vm_id)
+          ui.msg("Preparing the server to delete")
+          sleep(5)
+          server_destroy(vm_id)
+        rescue Exception => e
+          ui.warn("Error trying to destroy the server. Does the server exists?")
+          exit 1
+        end
         
         #TODO: remove server from chef
         if config[:purge]

data/lib/knife-proxmox/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Proxmox
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef