knife-ec2 0.5.4 → 0.5.5

data/README.rdoc

@@ -27,7 +27,7 @@ If your knife.rb file will be checked into a SCM system (ie readable by others)
 You also have the option of passing your AWS API Key/Secret into the individual knife subcommands using the <tt>-A</tt> (or <tt>--aws-access-key-id</tt>) <tt>-K</tt> (or <tt>--aws-secret-access-key</tt>) command options
 
     # provision a new m1.small Ubuntu 10.04 webserver
-    knife ec2 server create 'role[webserver]' -i ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
+    knife ec2 server create 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
 
 Additionally the following options may be set in your `knife.rb`:
 

data/lib/chef/knife/ec2_server_create.rb

@@ -106,6 +106,11 @@ class Chef
         :long => "--prerelease",
         :description => "Install the pre-release chef gems"
 
+      option :bootstrap_version,
+        :long => "--bootstrap-version VERSION",
+        :description => "The version of Chef to install",
+        :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
       option :region,
         :long => "--region REGION",
         :description => "Your AWS region",
@@ -184,6 +189,11 @@ class Chef
 
         ami = connection.images.get(locate_config_value(:image))
 
+        if ami.nil?
+          ui.error("You have not provided a valid image (AMI) value.  Please note the short option for this value recently changed from '-i' to '-I'.")
+          exit 1
+        end
+
         server_def = {
           :image_id => locate_config_value(:image),
           :groups => config[:security_groups],
@@ -288,6 +298,7 @@ class Chef
             end
           end
         end
+        puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
         puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
       end
 
@@ -299,6 +310,7 @@ class Chef
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
         bootstrap.config[:prerelease] = config[:prerelease]
+        bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true
         bootstrap.config[:template_file] = locate_config_value(:template_file)

data/lib/chef/knife/ec2_server_list.rb

@@ -75,7 +75,7 @@ class Chef
           server_list << (server.flavor_id == nil ? "" : server.flavor_id)
           server_list << (server.image_id == nil ? "" : server.image_id)
           server_list << server.groups.join(", ")
-          server_list << server.state
+          server_list << (server.state == nil ? "" : server.state)
         end
         puts ui.list(server_list, :columns_across, 7)
 

data/lib/knife-ec2/version.rb

@@ -1,4 +1,4 @@
 module KnifeEC2
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: knife-ec2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency