knife-openstack 0.5.3 → 0.5.4

data/README.rdoc

@@ -35,7 +35,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 OpenStack API Key/Secret into the individual knife subcommands using the <tt>-A</tt> (or <tt>--openstack-access-key-id</tt>) <tt>-K</tt> (or <tt>--openstack-secret-access-key</tt>) command options
 
     # provision a new m1.small Ubuntu 10.04 webserver
-    knife openstack server create 'role[webserver]' -i ami-7000f019 -f m1.small -A 'Your OpenStack Access Key ID' -K 'Your OpenStack Secret Access Key' --openstack-api-endpoint 'https://cloud.mycompany.com/v1.0'
+    knife openstack server create 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your OpenStack Access Key ID' -K 'Your OpenStack Secret Access Key' --openstack-api-endpoint 'https://cloud.mycompany.com/v1.0'
 
 Additionally the following options may be set in your `knife.rb`:
 

data/lib/chef/knife/openstack_image_list.rb

@@ -68,14 +68,22 @@ class Chef
           ui.color('Name', :bold),
           ui.color('Location', :bold)
         ]
-        connection.images.sort_by(&:name).each do |image|
-          image_list << image.id.to_s
-          image_list << image.kernel_id.to_s
-          image_list << image.architecture.to_s
+
+        connection.images.sort_by do |image|
+          [image.name, image.id].compact
+        end.each do |image|
+          image_list << image.id
+          image_list << image.kernel_id
+          image_list << image.architecture
           image_list << image.root_device_type
           image_list << image.name
           image_list << image.location
         end
+
+        image_list = image_list.map do |item|
+          item.to_s
+        end
+
         puts ui.list(image_list, :columns_across, 6)
       end
     end

data/lib/chef/knife/openstack_server_create.rb

@@ -109,6 +109,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 OpenStack region",
@@ -222,6 +227,7 @@ class Chef
         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(', ')}"
       end
 
@@ -233,6 +239,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/knife-openstack/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module OpenStack
-    VERSION = "0.5.3"
+    VERSION = "0.5.4"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: knife-openstack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Seth Chisamore
@@ -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