Fix issue with configuration parameters.

This is same fix as fnichol#48 expect applying it a little bit better to all of the different provisioners.
johnbellone · Mar 17, 2014 · cf505fd · cf505fd
1 parent 4a919cd
commit cf505fd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -50,12 +50,12 @@ knife server bootstrap linode \
   --ssh-password 'testing1234'
 ```
 
-To spin up your Chef Server on Openstack:
+To spin up your Chef Server on [OpenStack][openstack]:
 
 ```bash
 knife server bootstrap openstack \
   --node-name openstack.example.com \
-  --linode-node-name openstack \
+  --openstack-node-name openstack \
   --openstack-username $OS_USERNAME \
   --openstack-password $OS_PASSWORD \
   --openstack-auth-url $OS_AUTH_URL \
@@ -646,3 +646,4 @@ Apache License, Version 2.0 (see [LICENSE][license])
 [knife-openstack]:          https://github.com/opscode/knife-openstack
 [stevendanna]:              https://github.com/stevendanna
 [vagrant_site]:             http://vagrantup.com/
+[openstack]:    http://openstack.org
diff --git a/lib/chef/knife/server_bootstrap_ec2.rb b/lib/chef/knife/server_bootstrap_ec2.rb
@@ -72,7 +72,8 @@ def ec2_bootstrap
         ENV['NO_TEST'] = "1" if config[:no_test]
         bootstrap = Chef::Knife::Ec2ServerCreate.new
         Chef::Knife::Ec2ServerCreate.options.keys.each do |attr|
-          bootstrap.config[attr] = config_val(attr)
+          value = config_val(attr)
+          bootstrap.config[attr] = value unless ((value.is_a?(Array) and value[1].nil?) or value.nil?)
         end
         bootstrap.config[:tags] = bootstrap_tags
         bootstrap.config[:distro] = bootstrap_distro

diff --git a/lib/chef/knife/server_bootstrap_linode.rb b/lib/chef/knife/server_bootstrap_linode.rb
@@ -63,7 +63,8 @@ def linode_bootstrap
         ENV['NO_TEST'] = "1" if config[:no_test]
         bootstrap = Chef::Knife::LinodeServerCreate.new
         Chef::Knife::LinodeServerCreate.options.keys.each do |attr|
-          bootstrap.config[attr] = config_val(attr)
+          value = config_val(attr)
+          bootstrap.config[attr] = value unless ((value.is_a?(Array) and value[1].nil?) or value.nil?)
         end
         bootstrap.config[:distro] = bootstrap_distro
         bootstrap

diff --git a/lib/chef/knife/server_bootstrap_openstack.rb b/lib/chef/knife/server_bootstrap_openstack.rb
@@ -63,7 +63,8 @@ def openstack_bootstrap
         ENV['NO_TEST'] = "1" if config[:no_test]
         bootstrap = Chef::Knife::OpenstackServerCreate.new
         Chef::Knife::OpenstackServerCreate.options.keys.each do |attr|
-          bootstrap.config[attr] = config_val(attr)
+          value = config_val(attr)
+          bootstrap.config[attr] = value unless ((value.is_a?(Array) and value[1].nil?) or value.nil?)
         end
         bootstrap.config[:distro] = bootstrap_distro
         bootstrap

diff --git a/lib/chef/knife/server_bootstrap_standalone.rb b/lib/chef/knife/server_bootstrap_standalone.rb
@@ -58,7 +58,8 @@ def standalone_bootstrap
         bootstrap = Chef::Knife::Bootstrap.new
         bootstrap.name_args = [ config[:host] ]
         Chef::Knife::Bootstrap.options.keys.each do |attr|
-          bootstrap.config[attr] = config_val(attr)
+          value = config_val(attr)
+          bootstrap.config[attr] = value unless ((value.is_a?(Array) and value[1].nil?) or value.nil?)
         end
         bootstrap.ui = self.ui
         bootstrap.config[:distro] = bootstrap_distro

diff --git a/lib/knife/server/ssh.rb b/lib/knife/server/ssh.rb
@@ -25,7 +25,7 @@ class SSH
       USER_SWITCH_COMMAND = %[sudo USER=root HOME="$(getent passwd root | cut -d : -f 6)"]
 
       def initialize(params)
-        options = DEFAULT_OPTIONS.merge(params) { |k,o,n| o = n if n }
+        options = DEFAULT_OPTIONS.merge(params)
 
         @host = options.delete(:host)
         @user = options.delete(:user)