Merge pull request #105 from ninefold/fix-stack-create-actions

Fix stack create actions

Author: sbotman

README.rdoc

@@ -311,6 +311,8 @@ Displays all the volumes that are currently available within the cloudstack envi
 Creates a "stack" of servers based on a JSON definition file. Simple orchestration can be performed by
 specifying one or more actions to be executed after a server (or group of servers) is created.
 
+<tt>--skip-existing</tt>        Skip erroring on any servers already created in the stack (default is false)
+
 ==== Example Stack Definition File:
 
     {

lib/chef/knife/cs_baselist.rb

@@ -49,9 +49,9 @@ def self.included(includer)
 
       def output_format(json)
         if locate_config_value(:format) =~ /^j/i
-          json_hash = {}; 
+          json_hash = {};
           json.each { |k| json_hash.merge!( k['id'] => k) }
-          puts JSON.pretty_generate(json_hash) 
+          puts JSON.pretty_generate(json_hash)
           exit 0
         end
       end
@@ -85,16 +85,16 @@ def list_object(columns, object)
         object_list = []
         if locate_config_value(:fields)
           locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-        else 
+        else
           columns.each do |column|
-            n = (column.split(':').first).strip 
+            n = (column.split(':').first).strip
             object_list << (ui.color("#{n}", :bold) || 'N/A')
           end
         end
 
         n_columns = object_list.count
         object_list = [] if locate_config_value(:noheader)
-   
+
         object.each do |r|
           if locate_config_value(:fields)
             locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }

lib/chef/knife/cs_server_create.rb

@@ -206,9 +206,9 @@ class CsServerCreate < Chef::Knife
            :default => []
 
     option :aag,
-	        :long => "--anti-affinity-groups GROUP_NAME",
-          :description => "Comma separated list of anti-affinity group names",
-          :default => false
+           :long => "--anti-affinity-groups GROUP_NAME",
+           :description => "Comma separated list of anti-affinity group names",
+           :default => false
 
     option :fw_rules,
            :short => "-f PORT_RULES",

lib/chef/knife/cs_server_delete.rb

@@ -63,8 +63,8 @@ def run
           ui.msg("Deleted server #{hostname}")
 
           # delete chef client and node
-          node_name = connection.get_server_fqdn server
-          delete_chef = confirm_action("Do you want to delete the chef node and client '#{node_name}")
+          node_name = hostname  # connection.get_server_fqdn server ## server create doesn't add fqdn!
+          delete_chef = confirm_action("Do you want to delete the chef node and client '#{node_name}'")
           if delete_chef
             delete_node node_name
             delete_client node_name
@@ -76,7 +76,7 @@ def run
 
     def show_object_details(s, connection, rules)
       return if locate_config_value(:yes)
-      
+
       object_fields = []
       object_fields << ui.color("Name:", :cyan)
       object_fields << s['name'].to_s

lib/chef/knife/cs_stack_create.rb

@@ -58,6 +58,11 @@ class CsStackCreate < Chef::Knife
            :long => "--identity-file IDENTITY_FILE",
            :description => "The SSH identity file used for authentication"
 
+    option :skip_existing,
+           :long => "--skip-existing",
+           :default => false,
+           :description => "Skip creating existing server(s)"
+
     def run
       validate_base_options
       if @name_args.first.nil?
@@ -82,9 +87,13 @@ def create_stack(stack)
           # create server(s)
           names = server[:name].split(/[\s,]+/)
           names.each do |n|
-            s = Mash.new(server)
-            s[:name] = n
-            create_server(s)
+            if (config[:skip_existing] && connection.get_server(n))
+              ui.msg(ui.color("\nServer #{n} already exists; skipping create...", :yellow))
+            else
+              s = Mash.new(server)
+              s[:name] = n
+              create_server(s)
+            end
           end
 
         end
@@ -109,19 +118,19 @@ def create_server(server)
       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]
+      cmd.config[:ssh_port] = server[:ssh_port] || locate_config_value(:ssh_port) || "22"
       cmd.config[:identity_file] = config[:identity_file]
       cmd.config[:keypair] = server[:keypair]
       cmd.config[:cloudstack_template] = server[:template] if server[:template]
       cmd.config[:cloudstack_service] = server[:service] if server[:service]
       cmd.config[:cloudstack_zone] = server[:zone] if server[:zone]
       server.has_key?(:public_ip) ? cmd.config[:public_ip] = server[:public_ip] : cmd.config[:no_public_ip] = true
       cmd.config[:ik_private_ip] = server[:private_ip] if server[:private_ip]
-      cmd.config[:bootstrap] = server[:bootstrap] if server.has_key?(:bootstrap) 
-      cmd.config[:bootstrap_protocol] = server[:bootstrap_protocol] || "ssh"  
-      cmd.config[:distro] = server[:distro] || "chef-full"  
-      cmd.config[:template_file] = server[:template_file] if server.has_key?(:template_file)  
-      cmd.config[:no_host_key_verify] = server[:no_host_key_verify] if server.has_key?(:no_host_key_verify)  
+      cmd.config[:bootstrap] = server[:bootstrap] if server.has_key?(:bootstrap)
+      cmd.config[:bootstrap_protocol] = server[:bootstrap_protocol] || "ssh"
+      cmd.config[:distro] = server[:distro] || "chef-full"
+      cmd.config[:template_file] = server[:template_file] if server.has_key?(:template_file)
+      cmd.config[:no_host_key_verify] = server[:no_host_key_verify] if server.has_key?(:no_host_key_verify)
       cmd.config[:cloudstack_networks] = server[:networks].split(/[\s,]+/) if server[:networks]
       cmd.config[:run_list] = server[:run_list].split(/[\s,]+/) if server[:run_list]
       cmd.config[:port_rules] = server[:port_rules].split(/[\s,]+/) if server[:port_rules]
@@ -134,6 +143,7 @@ def create_server(server)
     end
 
     def run_actions(actions)
+      return if actions.nil? || actions.empty?
       puts "\n"
       ui.msg("Processing actions...")
       sleep 1 # pause for e.g. chef solr indexing
@@ -183,7 +193,6 @@ def search_nodes(query, attribute=nil)
     end
 
     def knife_ssh(host_list, command)
-
       ssh = Chef::Knife::Ssh.new
       ssh.name_args = [host_list, command]
       ssh.config[:ssh_user] = config[:ssh_user]
@@ -203,7 +212,6 @@ def knife_ssh_with_password_auth(host_list, command)
     end
 
     def knife_ssh_action(query, command)
-
       public_ips = find_public_ips(query)
       return if public_ips.nil? || public_ips.empty?
       host_list = public_ips.join(' ')
@@ -218,7 +226,6 @@ def knife_ssh_action(query, command)
           ssh.run
         end
       end
-
     end
 
     def http_request(url)
@@ -229,7 +236,6 @@ def http_request(url)
         url = url.sub(/\$\{#{server_name}\}/, ip)
       end
 
-
       puts "HTTP Request: #{url}"
       puts `curl -s -m 5 #{url}`
     end
@@ -272,24 +278,6 @@ def get_environment
       current_stack[:environment]
     end
 
-    def destroy_all(domain, excludes=[])
-      servers = connection.list_servers || []
-      servers.each do |s|
-        excluded = false
-        excludes.each { |val|
-          if s['name'] =~ /#{val}/ then
-            excluded = true
-            next
-          end
-        }
-        next if excluded
-        nodename = "#{s['name']}.#{domain}"
-        system "knife cs server delete #{s['name']} -y"
-        system "knife client delete #{nodename} -y"
-        system "knife node delete #{nodename} -y"
-      end
-    end
-
     def print_local_hosts
       hosts = []
       current_stack[:servers].each do |server|

lib/knife-cloudstack/connection.rb

@@ -72,7 +72,7 @@ def get_project_id(name)
       end
       project['id']
     end
-  
+
     ##
     # Finds the server with the specified name.
 
@@ -103,7 +103,7 @@ def get_server_public_ip(server, cached_rules=nil, cached_nat=nil)
       return ssh_rule['ipaddress'] if ssh_rule
 
       winrm_rule = get_winrm_port_forwarding_rule(server, cached_rules)
-      return winrm_rule['ipaddress'] if winrm_rule 
+      return winrm_rule['ipaddress'] if winrm_rule
 
       #check for static NAT
       if cached_nat
@@ -679,7 +679,7 @@ def get_public_ip_address(ip_address)
     end
 
     def list_public_ip_addresses(listall=false)
-      params = { 'command' => 'listPublicIpAddresses' } 
+      params = { 'command' => 'listPublicIpAddresses' }
       params['listall'] = listall
 
       json = send_request(params)
@@ -793,8 +793,8 @@ def get_ssh_port_forwarding_rule(server, cached_rules=nil)
             r['publicport'] == '22'
       }.first
     end
- 
-    ## 
+
+    ##
     # Gets the WINRM port forwarding rule for the specified server.
 
     def get_winrm_port_forwarding_rule(server, cached_rules=nil)
@@ -875,16 +875,16 @@ def send_request(params)
       uri = URI.parse(url)
 
       http = http_client_builder.new(uri.host, uri.port)
- 
+
       if uri.scheme == "https"
         http.use_ssl = true
         # Still need to do some testing on SSL, so will fix this later
         if @no_ssl_verify
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         else
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         end
-      end 
+      end
       request = Net::HTTP::Get.new(uri.request_uri)
       response = http.request(request)