knife-ec2 0.5.1 → 0.5.2

data/lib/chef/knife/ec2_instance_data.rb

@@ -23,19 +23,26 @@ class Chef
   class Knife
     class Ec2InstanceData < Knife
 
-      banner "knife ec2 instance data [RUN LIST...] (options)"
+      banner "knife ec2 instance data (options)"
 
       option :edit,
         :short => "-e",
         :long => "--edit",
         :description => "Edit the instance data"
 
+      option :run_list,
+        :short => "-r RUN_LIST",
+        :long => "--run-list RUN_LIST",
+        :description => "Comma separated list of roles/recipes to apply",
+        :proc => lambda { |o| o.split(/[\s,]+/) },
+        :default => []
+
       def run
         data = {
           "chef_server" => Chef::Config[:chef_server_url],
           "validation_client_name" => Chef::Config[:validation_client_name],
           "validation_key" => IO.read(Chef::Config[:validation_key]),
-          "attributes" => { "run_list" => @name_args }
+          "attributes" => { "run_list" => config[:run_list] }
         }
         data = edit_data(data) if config[:edit]
         output(data)

data/lib/chef/knife/ec2_server_create.rb

@@ -26,6 +26,14 @@ class Chef
   class Knife
     class Ec2ServerCreate < Knife
 
+      deps do
+        Chef::Knife::Bootstrap.load_deps
+        require 'fog'
+        require 'highline'
+        require 'net/ssh/multi'
+        require 'readline'
+      end
+
       banner "knife ec2 server create (options)"
 
       attr_accessor :initial_sleep_delay
@@ -170,10 +178,6 @@ class Chef
       end
 
       def run
-        require 'fog'
-        require 'highline'
-        require 'net/ssh/multi'
-        require 'readline'
 
         $stdout.sync = true
 
@@ -245,14 +249,15 @@ class Chef
 
         if !vpc_mode?
           puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-          puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+          puts "#{h.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
           puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
         end
         puts "#{h.color("Private IP Address", :cyan)}: #{server.private_ip_address}"
 
         print "\n#{h.color("Waiting for sshd", :magenta)}"
 
-        print(".") until tcp_test_ssh(display_name) {
+        ip_to_test = vpc_mode? ? server.private_ip_address : server.public_ip_address
+        print(".") until tcp_test_ssh(ip_to_test) {
           sleep @initial_sleep_delay ||= (vpc_mode? ? 40 : 10)
           puts("done")
         }
@@ -269,7 +274,7 @@ class Chef
           puts "#{h.color("Subnet ID", :cyan)}: #{server.subnet_id}"
         else
           puts "#{h.color("Public DNS Name", :cyan)}: #{server.dns_name}"
-          puts "#{h.color("Public IP Address", :cyan)}: #{server.ip_address}"
+          puts "#{h.color("Public IP Address", :cyan)}: #{server.public_ip_address}"
           puts "#{h.color("Private DNS Name", :cyan)}: #{server.private_dns_name}"
         end
         puts "#{h.color("SSH Key", :cyan)}: #{server.key_name}"

data/lib/chef/knife/ec2_server_delete.rb

@@ -70,7 +70,7 @@ class Chef
           msg("Security Groups", server.groups.join(", "))
           msg("SSH Key", server.key_name)
           msg("Public DNS Name", server.dns_name)
-          msg("Public IP Address", server.ip_address)
+          msg("Public IP Address", server.public_ip_address)
           msg("Private DNS Name", server.private_dns_name)
           msg("Private IP Address", server.private_ip_address)
 

data/lib/chef/knife/ec2_server_list.rb

@@ -23,7 +23,7 @@ class Chef
   class Knife
     class Ec2ServerList < Knife
 
-      banner "knife ec2 server list [RUN LIST...] (options)"
+      banner "knife ec2 server list (options)"
 
       option :aws_access_key_id,
         :short => "-A ID",

data/lib/knife-ec2/version.rb

@@ -1,4 +1,4 @@
 module KnifeEC2
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-ec2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,64 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.14
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: net-ssh
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.1.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-ssh-multi
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.6.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: EC2 Support for Chef's Knife Command
 email: adam@opscode.com
 executables: []