knife-proxmox 0.0.18 → 0.0.19

data/CHANGELOG

@@ -1,6 +1,14 @@
 Author: Jorge Moratilla
 Date: 2012-10-07
 
+[2013-05-07]
+Version: 0.0.19
+* knife proxmox server destroy now includes option -y to avoid confirmation (used for scripting)
+
+[2013-05-03]
+Version: 0.0.18
+* knife proxmox server list now sorts output by vmid (default) and by field (vmid, node, name)
+
 [2013-04-29]
 Version: 0.0.17
 * knife proxmox server destroy now requests confirmation to delete a server

data/README.md

@@ -38,10 +38,10 @@ Then install your ruby language (recommended ruby-1.9.3-xxx)
 ### List servers
     $ knife proxmox server list
     Id   Node    Name                 Type    Status
-    104  node-1  tetatet.example.com  openvz  down
-    470  node-2  sg-node1.example.com openvz  up
     102  node-1  test                 qemu    down
+    104  node-1  tetatet.example.com  openvz  down
     202  node-2  chef-client1         openvz  down
+    470  node-2  sg-node1.example.com openvz  up
 
 ### Get info for a server
     $ knife proxmox server info -H tetatet.example.com -P ip
@@ -133,7 +133,7 @@ Then install your ruby language (recommended ruby-1.9.3-xxx)
 
 
 ### Destroy a server
-    $ knife proxmox server destroy -U https://localhost:8006/api2/json/ -u test -p test123 -n localhost -R pve -N vm-node1 -VV
+    $ knife proxmox server destroy -U https://localhost:8006/api2/json/ -u test -p test123 -n localhost -R pve -N vm-node1 -VV -P
     DEBUG: Using configuration from /home/jorge/workspace/chef-repo/.chef/knife.rb
     node to destroy: vm-node1 [vmid: 200]
     Continue? (Y/N) y
@@ -141,6 +141,9 @@ Then install your ruby language (recommended ruby-1.9.3-xxx)
     Result: 200
     ..............................
     Result: 200
+    WARNING: Deleted node vm-node1
+    WARNING: Deleted client vm-node1
+
 
 ## Installation
 
@@ -173,6 +176,12 @@ If you want to alter some variable by command line then you can use the followin
 -p --password <pass>   Same for password
 -r --realm    <realm>  Same for the realm used to authenticate
 
+There is a script in extra/set_environment_variables.sh that creates the
+set of variables needed for knife-proxmox. Just answer the questions and
+paste the output into your profile file.
+
+
+
 ### ABOUT CHEF AND PROXMOX
 
 To bootstrap a newly created VM, you should apply the patch inside the extra directory.  Otherwise you must

data/lib/chef/knife/proxmox_base.rb

@@ -167,14 +167,15 @@ class Chef
           else
             result = "NOK: error code = " + response.code.to_s
           end
-          taskid = JSON.parse(response.body)['data']
-          waitfor(taskid)
+          ui.msg(result)
+          taskid = JSON.parse(response.body)['data'] || nil
+          waitfor(taskid) unless taskid.nil?
           Chef::Log.debug("Action: #{action}, Result: #{result}\n")
         rescue Exception => msg
           result = "An exception ocurred.  Use -VV to show it"
-          Chef::Log.debug("Action: #{action}, Result: #{msg}\n")
+          Chef::Log.debug("Task ID: " + taskid.to_s + ", Class: " + taskid.class)
+          Chef::Log.debug("Action: #{action}, Return code: #{response.code}, Exception: #{msg}\n")
         end
-        ui.msg(result)
       end
       
       # waitfor end of the task, need the taskid and the timeout
@@ -190,6 +191,7 @@ class Chef
         end
       end
       
+      # server_start: Starts the server
       def server_start(vmid)
         node = vmid_to_node(vmid)
         ui.msg("Starting VM #{vmid} on node #{node}....")
@@ -208,25 +210,55 @@ class Chef
           # take the response and extract the taskid
           action_response("server stop",response)
         end
+        # TODO: check with server_get_data the status/current/status of the vmid to send the umount command
         rescue Exception => e
           ui.warn("The VMID does not match any node")
           exit 1
       end
       
+      # server_unmount: Unmounts the server's filesystem
+      def server_umount(vmid)
+        node = vmid_to_node(vmid)
+        ui.msg("Unmounting VM #{vmid} on node #{node}...")
+        @connection["nodes/#{node}/openvz/#{vmid}/status/umount"].post "", @auth_params do |response, request, result, &block|
+          # take the response and extract the taskid
+          action_response("server umount",response)
+        end
+        rescue Exception => e
+          ui.warn("The VMID does not match any node")
+          exit 1
+      end
+
+      
+      # server_create: Sends a vm_definition to proxmox for creation
       def server_create(vmid,vm_definition)
         ui.msg("Creating VM #{vmid}...")
         @connection["nodes/#{Chef::Config[:knife][:pve_node_name]}/openvz"].post "#{vm_definition}", @auth_params do |response, request, result, &block|
           action_response("server create",response)
         end
       end
-      
-      # server_get_address: Returns the IP Address of the machine to chef
-      # field is a string, and if it doesn't exist, it will return nil
+
+      # server_modify: Sends a vm_definition to a running VM 
+      # data: 
+      # PUT /api2/json/nodes/esxi-2/openvz/170/config
+      #   { 
+      #     memory=>2048
+      #     swap=>512
+      #     disk=>16
+      #     cpus=>4
+      #   }
+      # Definition must be a JSON
+      def server_modify(vmid,vm_definition)
+        ui.msg("Modifying VM #{vmid}...")
+        @connection["nodes/#{Chef::Config[:knife][:pve_node_name]}/openvz/#{vmid}/config"].put "#{vm_definition}", @auth_params do |response, request, result, &block|
+          action_response("server modify",response)
+        end
+      end
+
+      # server_get_data: Returns the parameter requested, or all 
       def server_get_data(vmid,field)
         node = vmid_to_node(vmid)
         @connection["nodes/#{node}/openvz/#{vmid}/status/current"].get @auth_params do |response, request, result, &block|
-          #action_response("server get data",response)
-          # (field.match('all'))?JSON.parse(response.body)['data'].to_json : JSON.parse(response.body)['data'][field]
           if (field == 'all') then
             JSON.parse(response.body)['data']
           else

data/lib/chef/knife/proxmox_server_destroy.rb

@@ -26,6 +26,11 @@ class Chef
         :long  => "--vmid number",
         :description => "The numeric identifier of the VM"
 
+      option :force,
+        :short => "-y",
+        :long  => "--yes",
+        :description => "Force answer to yes (useful for scripting)"
+
       def run
         # Needed
         connection
@@ -39,7 +44,9 @@ class Chef
             name = config[:chef_node_name]
             vm_id = server_name_to_vmid(name)
             puts "Server to destroy: #{name} [vmid: #{vm_id}]"
-            ui.confirm("Continue")
+            if (config[:force].nil?) then
+              ui.confirm("Continue")
+            end
         else
           vm_id = config[:vm_id]
         end

data/lib/chef/knife/proxmox_server_modify.rb

@@ -0,0 +1,71 @@
+require 'chef/knife/proxmox_base'
+
+class Chef
+  class Knife
+    class ProxmoxServerModify < Knife
+      
+      include Knife::ProxmoxBase
+      
+      banner "knife proxmox server modify (options)"
+      
+      # TODO: parameters for openvz should be in other object
+      option :vm_hostname,
+        :short => "-H hostname",
+        :long  => "--hostname hostname",
+        :description => "VM instance hostname"
+
+      option :vm_cpus,
+        :short => "-C CPUs",
+        :long  => "--cpus number",
+        :description => "Number of cpus of the VM instance"
+
+      option :vm_memory,
+        :short => "-M MB",
+        :long  => "--mem MB",
+        :description => "Memory in MB"
+
+      option :vm_swap,
+        :short => "-SW",
+        :long  => "--swap MB",
+        :description => "Memory in MB for swap"
+
+      option :vm_vmid,
+        :short => "-I id",
+        :long  => "--vmid id",
+        :description => "Id for the VM"
+
+      option :vm_disk,
+        :short => "-D disk",
+        :long  => "--disk GB",
+        :description => "Disk space in GB"
+
+      def run
+        # Needed
+        connection
+        
+        vm_config = Hash.new
+
+        vm_config[:id]       = config[:vm_vmid]     || nil
+        vm_config[:hostname] = config[:vm_hostname] || nil
+        vm_config[:cpus]     = config[:vm_cpus]     || nil #server_get_data(vm_id,"cpus")
+        vm_config[:memory]   = config[:vm_memory]   || nil #server_get_data(vm_id,"memory")
+        vm_config[:disk]     = config[:vm_disk]     || nil #server_get_data(vm_id,"disk")
+        vm_config[:swap]     = config[:vm_swap]     || nil #server_get_data(vm_id,"swap")
+        
+        vm_mod_op = vm_config.keys.select { |v| vm_config[v] }
+        vm_definition = []
+        vm_mod_op.each do |k|
+          # volver a usar el inject
+          vm_definition << "#{k.to_s}=#{vm_config[k].to_i}" unless k == :id
+        end
+        vm_modification = vm_definition.join('&').to_s
+        
+        
+        Chef::Log.debug(vm_modification)
+        server_modify(vm_config[:id],vm_modification)
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/proxmox_server_stop.rb

@@ -7,7 +7,7 @@ class Chef
 
       include Knife::ProxmoxBase
 
-      banner "knife proxmox server start (options)"
+      banner "knife proxmox server stop (options)"
 
       option :vm_id,
         :short => "-I number",
@@ -25,4 +25,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/knife-proxmox/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Proxmox
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
     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.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -82,6 +82,7 @@ files:
 - lib/chef/knife/proxmox_server_create.rb
 - lib/chef/knife/template.rb
 - lib/chef/knife/proxmox_template_available.rb
+- lib/chef/knife/proxmox_server_modify.rb
 - lib/chef/knife/connection.rb
 - lib/chef/knife/proxmox_server_list.rb
 - lib/knife-proxmox/version.rb