knife-cloudstack 0.0.16 → 0.0.17

data/CHANGES.rdoc

@@ -1,5 +1,12 @@
 = Changes
 
+== 2014-03-04 (0.0.17)
+* Added support for --isdynamicallyscalable for <tt>cs template register</tt> (Sander Botman, 3 Apr 2014)
+* Added support for --anti-affinity-groups for <tt>cs server create</tt> (John E. Vincent, 2 Apr 2014)
+* Bugfix: on winrm bootstrap (Sander van Harmelen, 26 Mar 2014)
+* Added support for --expunge for destroying server (Ian Southam, 19 Mar 2014)
+* Bugfix: cosmetic changes on error output (Sander Botman, 5 Mar 2014)
+
 == 2014-02-12 (0.0.16)
 * Added support for --no-public-ip for <tt>cs server list</tt> (Sander Botman, 12 Feb 2014)
 * Added support for secret and secret_file in <tt>cs server create</tt> (Jeremy Baumont, 10 Feb 2014)

data/lib/chef/knife/cs_server_create.rb

@@ -205,6 +205,11 @@ module KnifeCloudstack
            :proc => lambda { |o| o.split(/[\s,]+/) },
            :default => []
 
+    option :aag,
+	        :long => "--anti-affinity-groups GROUP_NAME",
+          :description => "Comma separated list of anti-affinity group names",
+          :default => false
+
     option :fw_rules,
            :short => "-f PORT_RULES",
            :long => "--fw-rules PORT_RULES",
@@ -241,7 +246,7 @@ module KnifeCloudstack
 
       # This little peace of code sets the Chef node-name to the VM name when a node-name is not specifically given
       unless locate_config_value :chef_node_name
-        Chef::Config[:knife][:chef_node_name] = @name_args.first
+        config[:chef_node_name] = @name_args.first
       end
 
       if @windows_image and locate_config_value(:kerberos_realm)
@@ -268,8 +273,9 @@ module KnifeCloudstack
       params['hypervisor'] = locate_config_value(:cloudstack_hypervisor) if locate_config_value(:cloudstack_hypervisor)
 
       params['keypair'] = locate_config_value :keypair  if locate_config_value :keypair
+      params['affinitygroupnames'] = locate_config_value :aag if locate_config_value :aag
       params['displayname'] = if locate_config_value :set_display_name and locate_config_value :chef_node_name then locate_config_value :chef_node_name else hostname end
-      params['ipaddress'] = locate_config_value(:ik_private_ip) if locate_config_value(:ik_private_ip) 
+      params['ipaddress'] = locate_config_value(:ik_private_ip) if locate_config_value(:ik_private_ip)
 
       server = connection.create_server(
           hostname,
@@ -585,9 +591,9 @@ module KnifeCloudstack
         ui.error("Unsupported Bootstrapping Protocol. Supported : winrm, ssh")
         exit 1
       end
-      bootstrap.config[:chef_node_name] = config[:chef_node_name] || server['id']
-      bootstrap.config[:encrypted_data_bag_secret] = config[:encrypted_data_bag_secret]
-      bootstrap.config[:encrypted_data_bag_secret_file] = config[:encrypted_data_bag_secret_file]
+      bootstrap.config[:chef_node_name] = locate_config_value(:chef_node_name) || server["name"]
+      bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:secret)
+      bootstrap.config[:encrypted_data_bag_secret_file] = locate_config_value(:secret_file)
       bootstrap_common_params(bootstrap)
     end
 

data/lib/chef/knife/cs_server_delete.rb

@@ -58,7 +58,7 @@ module KnifeCloudstack
         if result
           print "#{ui.color("Waiting for deletion", :magenta)}"
           disassociate_virtual_ip_address server
-          connection.delete_server hostname
+          connection.delete_server(hostname, false)
           puts "\n"
           ui.msg("Deleted server #{hostname}")
 

data/lib/chef/knife/cs_server_list.rb

@@ -45,7 +45,10 @@ module KnifeCloudstack
            :short => "-a ACTION",
            :long => "--action ACTION",
            :description => "start, stop or destroy the instances in your result"
-           
+
+    option :expunge,
+           :long => "--expunge",
+           :description => "If used with --action destroy, will cause the server to be expunged"
     option :public_ip,
            :long => "--[no-]public-ip",
            :description => "Show or don't show the public IP for server in your result",
@@ -70,7 +73,9 @@ module KnifeCloudstack
       params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
       params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
       params['name']    = locate_config_value(:name)    if locate_config_value(:name)
-      
+      params['expunge'] = locate_config_value(:expunge) if locate_config_value(:expunge)
+      params['expunge'] = false if params['expunge'].nil?
+     
       ##
       # Get the public IP address if possible, except when the option --no-public-ip is given.
 
@@ -89,7 +94,7 @@ module KnifeCloudstack
       # Executing actions against the list results that are returned.
 
       if locate_config_value(:action)
-        connection_result.each do |r|
+        result.each do |r|
           hostname = r['name'] 
           case locate_config_value(:action).downcase
           when "start" then
@@ -115,7 +120,7 @@ module KnifeCloudstack
             result = confirm_action("Do you really want to destroy this server ")
             if result then
               print "#{ui.color("Waiting for demolition", :magenta)}"
-              connection.delete_server(hostname)
+              connection.delete_server(hostname, params['expunge'])
               puts "\n"
               ui.msg("Destroyed server #{hostname}")
             end

data/lib/chef/knife/cs_stack_create.rb

@@ -60,7 +60,10 @@ module KnifeCloudstack
 
     def run
       validate_base_options
-
+      if @name_args.first.nil?
+        ui.error "Please specify json file eg: knife cs stack create JSON_FILE"
+        exit 1
+      end
       file_path = File.expand_path(@name_args.first)
       unless File.exist?(file_path) then
         ui.error "Stack file '#{file_path}' not found. Please check the path."
@@ -98,6 +101,12 @@ module KnifeCloudstack
       cmd = KnifeCloudstack::CsServerCreate.new([server[:name]])
       # configure and run command
       # TODO: validate parameters
+      cmd.config[:cloudstack_url] = config[:cloudstack_url]
+      cmd.config[:cloudstack_api_key] = config[:cloudstack_api_key]
+      cmd.config[:cloudstack_secret_key] = config[:cloudstack_secret_key]
+      cmd.config[:cloudstack_proxy] = config[:cloudstack_proxy]
+      cmd.config[:cloudstack_no_ssl_verify] = config[:cloudstack_no_ssl_verify]
+      cmd.config[:cloudstack_project] = config[:cloudstack_project]
       cmd.config[:ssh_user] = config[:ssh_user]
       cmd.config[:ssh_password] = config[:ssh_password]
       cmd.config[:ssh_port] = config[:ssh_port] || "22" # Chef::Config[:knife][:ssh_port]

data/lib/chef/knife/cs_stack_delete.rb

@@ -16,9 +16,13 @@
 # limitations under the License.
 #
 
+require 'chef/knife/cs_base'
+
 module KnifeCloudstack
   class CsStackDelete < Chef::Knife
 
+    include Chef::Knife::KnifeCloudstackBase
+
     deps do
       require 'chef/json_compat'
       require 'chef/mash'
@@ -30,25 +34,11 @@ module KnifeCloudstack
 
     banner "knife cs stack delete JSON_FILE (options)"
 
-    option :cloudstack_url,
-           :short => "-U URL",
-           :long => "--cloudstack-url URL",
-           :description => "The CloudStack endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:cloudstack_url] = url }
-
-    option :cloudstack_api_key,
-           :short => "-A KEY",
-           :long => "--cloudstack-api-key KEY",
-           :description => "Your CloudStack API key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_api_key] = key }
-
-    option :cloudstack_secret_key,
-           :short => "-K SECRET",
-           :long => "--cloudstack-secret-key SECRET",
-           :description => "Your CloudStack secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
-
     def run
+      if @name_args.first.nil?
+        ui.error "Please specify json file eg: knife cs stack delete JSON_FILE"
+        exit 1
+      end
       file_path = File.expand_path(@name_args.first)
       unless File.exist?(file_path) then
         ui.error "Stack file '#{file_path}' not found. Please check the path."
@@ -80,6 +70,7 @@ module KnifeCloudstack
     def delete_server(server_name)
       cmd = KnifeCloudstack::CsServerDelete.new([server_name])
       cmd.config[:yes] = true
+      cmd.config[:expunge] = true
       cmd.run_with_pretty_exceptions
     end
 

data/lib/chef/knife/cs_template_register.rb

@@ -73,6 +73,12 @@ module KnifeCloudstack
 	   :boolean => true,
 	   :default => false
 
+    option :isdynamicallyscalable,
+           :long => "--isdynamicallyscalable",
+           :description => "Is the template dynamically scalable. Default: NO",
+           :boolean => true,
+           :default => false
+
     option :featured,
            :long => "--[no-]featured",
 	   :description => "Is the tempalte featured? Default: NO",
@@ -159,6 +165,7 @@ module KnifeCloudstack
         'zoneid' => zoneid,
         'bits' => locate_config_value(:bits),
       }
+      params['isdynamicallyscalable'] = locate_config_value(:isdynamicallyscalable) if locate_config_value(:isdynamicallyscalable)
       params['isextractable'] = locate_config_value(:isextractable) if locate_config_value(:isextractable)
       params['ispublic'] = locate_config_value(:public) if locate_config_value(:public)
       params['isfeatured'] = locate_config_value(:featured) if locate_config_value(:featured)

data/lib/knife-cloudstack/connection.rb

@@ -81,17 +81,14 @@ module CloudstackClient
           'command' => 'listVirtualMachines',
           'name' => name
       }
-      # if @project_id
-      #   params['projectId'] = @project_id
-      # end
       json = send_request(params)
       machines = json['virtualmachine']
 
       if !machines || machines.empty? then
         return nil
       end
-
-      machines.first
+      machine = machines.select { |item| name == item['name'] }
+      machine.first
     end
 
     ##
@@ -174,14 +171,14 @@ module CloudstackClient
 
       if host_name then
         if get_server(host_name) then
-          puts "Error: Server '#{host_name}' already exists."
+          puts "\nError: Server '#{host_name}' already exists."
           exit 1
         end
       end
 
       service = get_service_offering(service_name)
       if !service then
-        puts "Error: Service offering '#{service_name}' is invalid"
+        puts "\nError: Service offering '#{service_name}' is invalid"
         exit 1
       end
 
@@ -189,14 +186,14 @@ module CloudstackClient
       template = get_iso(template_name, zone_name) unless template
 
       if !template then
-        puts "Error: Template / ISO name: '#{template_name}' is invalid"
+        puts "\nError: Template / ISO name: '#{template_name}' is invalid"
         exit 1
       end
 
       if disk_name then
         disk = get_disk_offering(disk_name)
         if !disk then
-          puts "Error: Disk offering '#{disk_name}' is invalid"
+          puts "\nError: Disk offering '#{disk_name}' is invalid"
           exit 1
         end
       end
@@ -204,7 +201,7 @@ module CloudstackClient
       zone = zone_name ? get_zone(zone_name) : get_default_zone
       if !zone then
         msg = zone_name ? "Zone '#{zone_name}' is invalid" : "No default zone found"
-        puts "Error: #{msg}"
+        puts "\nError: #{msg}"
         exit 1
       end
 
@@ -218,7 +215,7 @@ module CloudstackClient
           network_names.each do |name|
             network = get_network(name)
             if !network then
-              puts "Error: Network '#{name}' not found"
+              puts "\nError: Network '#{name}' not found"
             end
             networks << get_network(name)
           end
@@ -228,7 +225,7 @@ module CloudstackClient
           networks << get_default_network(zone['id'])
         end
         if networks.empty? then
-          puts "No default network found"
+          puts "\nError: No default network found"
           exit 1
         end
         network_ids = networks.map { |network|
@@ -267,16 +264,17 @@ module CloudstackClient
     # Deletes the server with the specified name.
     #
 
-    def delete_server(name)
+    def delete_server(name, expunge)
       server = get_server(name)
       if !server || !server['id'] then
-        puts "Error: Virtual machine '#{name}' does not exist"
+        puts "\nError: Virtual machine '#{name}' does not exist"
         exit 1
       end
 
       params = {
           'command' => 'destroyVirtualMachine',
-          'id' => server['id']
+          'id' => server['id'],
+          'expunge' => expunge
       }
 
       json = send_async_request(params)
@@ -290,7 +288,7 @@ module CloudstackClient
     def stop_server(name, forced=nil)
       server = get_server(name)
       if !server || !server['id'] then
-        puts "Error: Virtual machine '#{name}' does not exist"
+        puts "\nError: Virtual machine '#{name}' does not exist"
         exit 1
       end
 
@@ -311,7 +309,7 @@ module CloudstackClient
     def start_server(name)
       server = get_server(name)
       if !server || !server['id'] then
-        puts "Error: Virtual machine '#{name}' does not exist"
+        puts "\nError: Virtual machine '#{name}' does not exist"
         exit 1
       end
 
@@ -331,7 +329,7 @@ module CloudstackClient
     def reboot_server(name)
       server = get_server(name)
       if !server || !server['id'] then
-        puts "Error: Virtual machine '#{name}' does not exist"
+        puts "\nError: Virtual machine '#{name}' does not exist"
         exit 1
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -64,50 +64,50 @@ files:
 - CHANGES.rdoc
 - README.rdoc
 - LICENSE
-- lib/chef/knife/cs_keypair_delete.rb
-- lib/chef/knife/cs_user_list.rb
-- lib/chef/knife/cs_securitygroup_list.rb
-- lib/chef/knife/cs_template_list.rb
-- lib/chef/knife/cs_baselist.rb
-- lib/chef/knife/cs_network_list.rb
+- lib/chef/knife/cs_iso_list.rb
+- lib/chef/knife/cs_server_add_nic.rb
+- lib/chef/knife/cs_template_register.rb
+- lib/chef/knife/cs_cluster_list.rb
+- lib/chef/knife/cs_template_create.rb
+- lib/chef/knife/cs_disk_list.rb
+- lib/chef/knife/cs_template_extract.rb
+- lib/chef/knife/cs_server_list.rb
+- lib/chef/knife/cs_aag_list.rb
 - lib/chef/knife/cs_host_list.rb
-- lib/chef/knife/cs_firewallrule_list.rb
+- lib/chef/knife/cs_network_list.rb
+- lib/chef/knife/cs_oscategory_list.rb
 - lib/chef/knife/cs_config_list.rb
-- lib/chef/knife/cs_template_register.rb
-- lib/chef/knife/cs_server_create.rb
+- lib/chef/knife/cs_domain_list.rb
 - lib/chef/knife/cs_hosts.rb
-- lib/chef/knife/cs_keypair_create.rb
-- lib/chef/knife/cs_server_start.rb
-- lib/chef/knife/cs_disk_list.rb
-- lib/chef/knife/cs_router_list.rb
-- lib/chef/knife/cs_server_stop.rb
-- lib/chef/knife/cs_publicip_list.rb
 - lib/chef/knife/cs_pod_list.rb
-- lib/chef/knife/cs_aag_list.rb
-- lib/chef/knife/cs_cluster_list.rb
-- lib/chef/knife/cs_server_reboot.rb
+- lib/chef/knife/cs_volume_create.rb
+- lib/chef/knife/cs_ostype_list.rb
 - lib/chef/knife/cs_base.rb
-- lib/chef/knife/cs_iso_list.rb
-- lib/chef/knife/cs_stack_create.rb
-- lib/chef/knife/cs_volume_list.rb
-- lib/chef/knife/cs_template_extract.rb
 - lib/chef/knife/cs_service_list.rb
+- lib/chef/knife/cs_server_create.rb
+- lib/chef/knife/cs_server_delete.rb
+- lib/chef/knife/cs_template_list.rb
+- lib/chef/knife/cs_publicip_list.rb
 - lib/chef/knife/cs_zone_list.rb
-- lib/chef/knife/cs_volume_create.rb
+- lib/chef/knife/cs_server_reboot.rb
+- lib/chef/knife/cs_server_remove_nic.rb
+- lib/chef/knife/cs_keypair_delete.rb
+- lib/chef/knife/cs_baselist.rb
+- lib/chef/knife/cs_router_list.rb
 - lib/chef/knife/cs_firewallrule_create.rb
-- lib/chef/knife/cs_forwardrule_create.rb
-- lib/chef/knife/cs_template_create.rb
-- lib/chef/knife/cs_oscategory_list.rb
-- lib/chef/knife/cs_server_list.rb
-- lib/chef/knife/cs_stack_delete.rb
 - lib/chef/knife/cs_account_list.rb
-- lib/chef/knife/cs_server_remove_nic.rb
-- lib/chef/knife/cs_server_delete.rb
-- lib/chef/knife/cs_domain_list.rb
-- lib/chef/knife/cs_server_add_nic.rb
+- lib/chef/knife/cs_server_start.rb
 - lib/chef/knife/cs_keypair_list.rb
+- lib/chef/knife/cs_server_stop.rb
+- lib/chef/knife/cs_stack_delete.rb
 - lib/chef/knife/cs_project_list.rb
-- lib/chef/knife/cs_ostype_list.rb
+- lib/chef/knife/cs_user_list.rb
+- lib/chef/knife/cs_volume_list.rb
+- lib/chef/knife/cs_stack_create.rb
+- lib/chef/knife/cs_keypair_create.rb
+- lib/chef/knife/cs_firewallrule_list.rb
+- lib/chef/knife/cs_forwardrule_create.rb
+- lib/chef/knife/cs_securitygroup_list.rb
 - lib/knife-cloudstack/connection.rb
 homepage: http://cloudstack.org/
 licenses: []
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A knife plugin for the CloudStack API