leverage msq_pair method from base module

remotesyssupport · Aug 15, 2011 · b5ed2ab · b5ed2ab
1 parent 5bc0464
commit b5ed2ab
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 38 deletions.
diff --git a/lib/chef/knife/openstack_server_create.rb b/lib/chef/knife/openstack_server_create.rb
@@ -170,12 +170,13 @@ def run
 
         server = connection.servers.create(server_def)
 
-        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
-        puts "#{ui.color("Image", :cyan)}: #{server.image_id}"
-        puts "#{ui.color("Availability Zone", :cyan)}: #{server.availability_zone}"
-        puts "#{ui.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
-        puts "#{ui.color("SSH Key", :cyan)}: #{server.key_name}"
+        msg_pair("Instance ID", server.id)
+        msg_pair("Flavor", server.flavor_id)
+        msg_pair("Image", server.image_id)
+        msg_pair("Region", connection.instance_variable_get(:@region))
+        msg_pair("Availability Zone", server.availability_zone)
+        msg_pair("Security Groups", server.groups.join(", "))
+        msg_pair("SSH Key", server.key_name)
 
         print "\n#{ui.color("Waiting for server", :magenta)}"
 
@@ -184,10 +185,10 @@ def run
 
         puts("\n")
 
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
-        puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
+        msg_pair("Public DNS Name", server.dns_name)
+        msg_pair("Public IP Address", server.public_ip_address)
+        msg_pair("Private DNS Name", server.private_dns_name)
+        msg_pair("Private IP Address", server.private_ip_address)
 
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
@@ -199,18 +200,19 @@ def run
         bootstrap_for_node(server).run
 
         puts "\n"
-        puts "#{ui.color("Instance ID", :cyan)}: #{server.id}"
-        puts "#{ui.color("Flavor", :cyan)}: #{server.flavor_id}"
-        puts "#{ui.color("Image", :cyan)}: #{server.image_id}"
-        puts "#{ui.color("Availability Zone", :cyan)}: #{server.availability_zone}"
-        puts "#{ui.color("Security Groups", :cyan)}: #{server.groups.join(", ")}"
-        puts "#{ui.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-        puts "#{ui.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
-        puts "#{ui.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
-        puts "#{ui.color("SSH Key", :cyan)}: #{server.key_name}"
-        puts "#{ui.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
-        puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
-        puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
+        msg_pair("Instance ID", server.id)
+        msg_pair("Flavor", server.flavor_id)
+        msg_pair("Image", server.image_id)
+        msg_pair("Region", connection.instance_variable_get(:@region))
+        msg_pair("Availability Zone", server.availability_zone)
+        msg_pair("Security Groups", server.groups.join(", "))
+        msg_pair("SSH Key", server.key_name)
+        msg_pair("Public DNS Name", server.dns_name)
+        msg_pair("Public IP Address", server.public_ip_address)
+        msg_pair("Private DNS Name", server.private_dns_name)
+        msg_pair("Private IP Address", server.private_ip_address)
+        msg_pair("Environment", config[:environment] || '_default')
+        msg_pair("Run List", config[:run_list].join(', '))
       end
 
       def bootstrap_for_node(server)

diff --git a/lib/chef/knife/openstack_server_delete.rb b/lib/chef/knife/openstack_server_delete.rb
@@ -33,16 +33,16 @@ def run
         @name_args.each do |instance_id|
           server = connection.servers.get(instance_id)
 
-          msg("Instance ID", server.id)
-          msg("Flavor", server.flavor_id)
-          msg("Image", server.image_id)
-          msg("Availability Zone", server.availability_zone)
-          msg("Security Groups", server.groups.join(", "))
-          msg("SSH Key", server.key_name)
-          msg("Public DNS Name", server.dns_name)
-          msg("Public IP Address", server.public_ip_address)
-          msg("Private DNS Name", server.private_dns_name)
-          msg("Private IP Address", server.private_ip_address)
+          msg_pair("Instance ID", server.id)
+          msg_pair("Flavor", server.flavor_id)
+          msg_pair("Image", server.image_id)
+          msg_pair("Availability Zone", server.availability_zone)
+          msg_pair("Security Groups", server.groups.join(", "))
+          msg_pair("SSH Key", server.key_name)
+          msg_pair("Public DNS Name", server.dns_name)
+          msg_pair("Public IP Address", server.public_ip_address)
+          msg_pair("Private DNS Name", server.private_dns_name)
+          msg_pair("Private IP Address", server.private_ip_address)
 
           puts "\n"
           confirm("Do you really want to delete this server")
@@ -53,12 +53,6 @@ def run
         end
       end
 
-      def msg(label, value)
-        if value && !value.empty?
-          puts "#{ui.color(label, :cyan)}: #{value}"
-        end
-      end
-
     end
   end
 end