openstack_server_create.rb in knife-openstack-0.5.4

- old
+ new

@@ -107,10 +107,15 @@
 
       option :prerelease,
         :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",
         :proc => Proc.new { |region| Chef::Config[:knife][:region] = region }
 
@@ -220,10 +225,11 @@
         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(', ')}"
       end
 
       def bootstrap_for_node(server)
         bootstrap = Chef::Knife::Bootstrap.new
@@ -231,9 +237,10 @@
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:ssh_user] = config[:ssh_user]
         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)
         bootstrap.config[:environment] = config[:environment]
         # may be needed for vpc_mode