knife-rackspace 0.5.3 → 0.5.4

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 Rackspace API Username/Key into the individual knife subcommands using the <tt>-A</tt> (or <tt>--rackspace-api-username</tt>) <tt>-K</tt> (or <tt>--rackspace-api-key</tt>) command options
 
     # provision a new 1GB Ubuntu 10.04 webserver
-    knife rackspace server create 'role[webserver]' -i 49 -f 3 -A 'Your Rackspace API username' -K "Your Rackspace API Key"
+    knife rackspace server create 'role[webserver]' -I 49 -f 3 -A 'Your Rackspace API username' -K "Your Rackspace API Key"
 
 This plugin also has support for authenticating against an alternate API Auth URL.  This is useful if you are a Rackspace Cloud UK user or OpenStack early adopter.  Here is an example of configuring knife for Rackspace Cloud UK:
 

data/lib/chef/knife/rackspace_server_create.rb

@@ -90,6 +90,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 :distro,
         :short => "-d DISTRO",
         :long => "--distro DISTRO",
@@ -135,7 +140,6 @@ class Chef
       end
 
       def run
-
         $stdout.sync = true
 
         connection = Fog::Compute.new(
@@ -185,6 +189,7 @@ class Chef
         puts "#{ui.color("Public IP Address", :cyan)}: #{server.addresses["public"][0]}"
         puts "#{ui.color("Private IP Address", :cyan)}: #{server.addresses["private"][0]}"
         puts "#{ui.color("Password", :cyan)}: #{server.password}"
+        puts "#{ui.color("Environment", :cyan)}: #{config[:environment] || '_default'}"
         puts "#{ui.color("Run List", :cyan)}: #{config[:run_list].join(', ')}"
       end
 
@@ -197,14 +202,20 @@ 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[:distro] = Chef::Config[:knife][:distro] || config[:distro]
+        bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+        bootstrap.config[:distro] = locate_config_value(:distro)
         # bootstrap will run as root...sudo (by default) also messes up Ohai on CentOS boxes
         bootstrap.config[:use_sudo] = config[:use_sudo]
-        bootstrap.config[:template_file] = Chef::Config[:knife][:template_file] || config[:template_file]
+        bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = config[:environment]
         bootstrap
       end
 
+      def locate_config_value(key)
+        key = key.to_sym
+        Chef::Config[:knife][key] || config[key]
+      end
+
       def public_dns_name(server)
         @public_dns_name ||= begin
           Resolv.getname(server.addresses["public"][0])

data/lib/knife-rackspace/version.rb

@@ -1,3 +1,3 @@
 module KnifeRackspace
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

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