knife-openstack 0.8.0 → 0.8.1

data/CHANGELOG.md

@@ -1,29 +1,34 @@
+## v0.8.1
+
+* KNIFE-296 knife-windows overrides -i, -p, -P and -x options with winrm values
+* KNIFE-304 enable setting the ssh port for knife-openstack
+
 ## v0.8.0
 
-* Windows bootstrapping (winrm-based) support for knife-openstack (KNIFE-221)(Chirag Jog)
+* KNIFE-221 Windows bootstrapping (winrm-based) support for knife-openstack (Chirag Jog)
 
 ## v0.7.1
 
-* file permissions fixed (KNIFE-261)
+* KNIFE-261 file permissions fixed
 
 ## v0.7.0
 * Update dependency on to Fog 1.10.0
 * 'delay-loading' changes to reduce load-time (Mohit Sethi)
-* Use the hint with the bootstrap method instead of assuming the :personality works with the server.create method (KNIFE-201)
-* Added 'knife openstack group list' for listing security groups and their rules (KNIFE-227)
+* KNIFE-201 Use the hint with the bootstrap method instead of assuming the :personality works with the server.create method
+* KNIFE-227 Added 'knife openstack group list' for listing security groups and their rules
 * Filter out extraneous images from knife openstack image list and added '--disable-filter' to disable
 * Fixed minor issue for public ip addresses (Edmund Haselwanter)
-* Fixed security groups, adding `-G` support (KNIFE-230)
+* KNIFE-230 Fixed security groups, adding `-G` support
 * Added snapshots as a new column in image list
-* "knife openstack image list" fails with empty image name (KNIFE-83)(Simon Belluzzo)
-* excon / fog errors are a JSON blob, Rescue fog errors (KNIFE-87)(Bryan McLellan)
+* KNIFE-83 "knife openstack image list" fails with empty image name (Simon Belluzzo)
+* KNIFE-87 excon / fog errors are a JSON blob, Rescue fog errors (Bryan McLellan)
 * Better error handling for connection errors.
-* Pass ssh_password to bootstrap (KNIFE-88)(David Petzel)
+* KNIFE-88 Pass ssh_password to bootstrap (David Petzel)
 * Catch Net Unreachable error (E.J. Finneran)
-* Allow an option to ignore the SSL cert (KNIFE-225)(BK Box)
+* KNIFE-225 Allow an option to ignore the SSL cert (BK Box)
 * Attach to floating IPs (Mohit Sethi)
-* Key pair is not required (KNIFE-226)(BK Box)
-* Fog 1.10.0 changes API for OpenStack IP addresses (KNIFE-248)
+* KNIFE-226 Key pair is not required (BK Box)
+* KNIFE-248 Fog 1.10.0 changes API for OpenStack IP addresses
 
 ## v0.6.2
 * Use less pessimistic fog version constraint.
@@ -33,10 +38,10 @@
 * Switched to OpenStack API from OpenStack EC2 API.
 * Updated to point to Fog 1.4.0 for latest `OpenStack` provider
 * testing with Diablo & Essex
-* knife openstack server create (KNIFE_OPENSTACK-1)
-* knife openstack server delete (KNIFE_OPENSTACK-2)
-* Support for unenven_columns for prettier output (KNIFE_OPENSTACK-5)
-* Added chef gem dependency (KNIFE_OPENSTACK-6)
+* KNIFE_OPENSTACK-1 knife openstack server create
+* KNIFE_OPENSTACK-2 knife openstack server delete
+* KNIFE_OPENSTACK-5 Support for unenven_columns for prettier output
+* KNIFE_OPENSTACK-6 Added chef gem dependency
 * Added virtual cpus to 'knife openstack flavor list'
 * Removed unsupported features to match current state of plugin (public_key, kernel, architecture, cores, location)
 * Added support for openstack_tenant (Rob Hirschfeld & Alexander Gordeev)
@@ -54,15 +59,14 @@
 This is a list of missing(?) features and open questions currently under development consideration:
 
 * Basic availability zones support (Jarek Zmudzinski) NEED TESTING ACCESS FOR AVAILABILITY ZONES
-* Windows bootstrapping (winrm-based) support for knife-openstack (KNIFE-221) winrm branch, UGLY WARNINGS NEED RESOLUTION
 * purge only works when names match up with clients
 * `knife openstack floating list|associate|release NODE` with --floating-ip-pool also
-* Allow specifying the name of the pool when using floating IPs (KNIFE-229)
+* KNIFE-229 Allow specifying the name of the pool when using floating IPs
 * attempt to allocate a floating ipaddress if none if free, currently missing in Fog
-* take either the flavor ID or the flavor name (KNIFE-76)
+* KNIFE-76 take either the flavor ID or the flavor name
 * take either the image ID or the image name (similar for KNIFE-76)
-* server create with expired password hangs (KNIFE-86)
-* added ability to specify arbitrary network ID (KNIFE-231)
+* KNIFE-86 server create with expired password hangs
+* KNIFE-231 added ability to specify arbitrary network ID
 * assumption of only single floating IP (and fog uses the last as the public_ip_address)
 * probably other places public network is assumed that could cause issues
 * fog is putting the original public IP address into the private_ip_address method when you get a floating_ip, this is wrong. Remove KNIFE-248 code once fixed.

data/lib/chef/knife/openstack_server_create.rb

@@ -82,6 +82,13 @@ class Chef
       :description => "The OpenStack SSH keypair id",
       :proc => Proc.new { |key| Chef::Config[:knife][:openstack_ssh_key_id] = key }
 
+      option :ssh_port,
+      :short => "-p PORT",
+      :long => "--ssh-port PORT",
+      :description => "The ssh port",
+      :default => "22",
+      :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
       option :ssh_user,
       :short => "-x USERNAME",
       :long => "--ssh-user USERNAME",
@@ -149,11 +156,11 @@ class Chef
       :default => 600,
       :proc => Proc.new { |v| Chef::Config[:knife][:server_create_timeouts] = v}
 
-      def tcp_test_ssh(hostname)
-        tcp_socket = TCPSocket.new(hostname, 22)
+      def tcp_test_ssh(hostname, port)
+        tcp_socket = TCPSocket.new(hostname, port)
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
-          Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
+          Chef::Log.debug("sshd accepting connections on #{hostname} port #{port}, banner is #{tcp_socket.gets}")
           yield
           true
         else
@@ -210,6 +217,28 @@ class Chef
         validate!
         if locate_config_value(:bootstrap_protocol) == 'winrm'
           load_winrm_deps
+        else
+          # workaround for KNIFE-296 winrm values stomping on ssh values
+          # unchanged ssh_user and changed winrm_user, override ssh_user
+          if locate_config_value(:ssh_user).eql?(options[:ssh_user][:default]) &&
+              !locate_config_value(:winrm_user).eql?(options[:winrm_user][:default])
+            config[:ssh_user] = locate_config_value(:winrm_user)
+          end
+          # unchanged ssh_port and changed winrm_port, override ssh_port
+          if locate_config_value(:ssh_port).eql?(options[:ssh_port][:default]) &&
+              !locate_config_value(:winrm_port).eql?(options[:winrm_port][:default])
+            config[:ssh_port] = locate_config_value(:winrm_port)
+          end
+          # unset ssh_password and set winrm_password, override ssh_password
+          if locate_config_value(:ssh_password).nil? &&
+              !locate_config_value(:winrm_password).nil?
+            config[:ssh_password] = locate_config_value(:winrm_password)
+          end
+          # unset identity_file and set kerberos_keytab_file, override identity_file
+          if locate_config_value(:identity_file).nil? &&
+              !locate_config_value(:kerberos_keytab_file).nil?
+            config[:identity_file] = locate_config_value(:kerberos_keytab_file)
+          end
         end
         #servers require a name, generate one if not passed
         node_name = get_node_name(config[:chef_node_name])
@@ -307,8 +336,9 @@ class Chef
         print(".") until tcp_test_winrm(bootstrap_ip_address, locate_config_value(:winrm_port))
         bootstrap_for_windows_node(server, bootstrap_ip_address).run
       else
+        Chef::Log.debug("Waiting for sshd on IP address: #{bootstrap_ip_address} and port: #{locate_config_value(:ssh_port)}")
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
-        print(".") until tcp_test_ssh(bootstrap_ip_address) {
+        print(".") until tcp_test_ssh(bootstrap_ip_address, locate_config_value(:ssh_port)) {
           sleep @initial_sleep_delay ||= 10
           puts("done")
         }
@@ -358,6 +388,7 @@ class Chef
       bootstrap = Chef::Knife::Bootstrap.new
       bootstrap.name_args = [bootstrap_ip_address]
       bootstrap.config[:ssh_user] = config[:ssh_user]
+      bootstrap.config[:ssh_port] = config[:ssh_port]
       bootstrap.config[:identity_file] = config[:identity_file]
       bootstrap.config[:host_key_verify] = config[:host_key_verify]
       bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'

data/lib/knife-openstack/version.rb

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

data/spec/unit/openstack_server_create_spec.rb

@@ -14,10 +14,10 @@ describe Chef::Knife::OpenstackServerCreate do
     @openstack_connection.stub_chain(:flavors, :get).and_return ('flavor_id')
     @openstack_connection.stub_chain(:images, :get).and_return mock('image_id')
     @openstack_connection.stub_chain(:addresses).and_return [mock('addresses', {
-            :instance_id => nil,
-            :ip => '111.111.111.111',
-            :fixed_ip => true
-            })]
+          :instance_id => nil,
+          :ip => '111.111.111.111',
+          :fixed_ip => true
+        })]
 
     @knife_openstack_create = Chef::Knife::OpenstackServerCreate.new
     @knife_openstack_create.initial_sleep_delay = 0
@@ -43,16 +43,16 @@ describe Chef::Knife::OpenstackServerCreate do
     @new_openstack_server = mock()
 
     @openstack_server_attribs = { :name => 'Mock Server',
-                                  :id => 'id-123456',
-                                  :key_name => 'key_name',
-                                  :flavor => 'flavor_id',
-                                  :image => 'image_id',
-                                  :addresses => {
-                                    'public' => [{'addr' => '75.101.253.10'}],
-                                    'private' => [{'addr' => '10.251.75.20'}]
-                                    },
-                                  :password => 'password'
-                                }
+      :id => 'id-123456',
+      :key_name => 'key_name',
+      :flavor => 'flavor_id',
+      :image => 'image_id',
+      :addresses => {
+        'public' => [{'addr' => '75.101.253.10'}],
+        'private' => [{'addr' => '10.251.75.20'}]
+      },
+      :password => 'password'
+    }
 
 
     @openstack_server_attribs.each_pair do |attrib, value|
@@ -60,6 +60,25 @@ describe Chef::Knife::OpenstackServerCreate do
     end
   end
 
+  describe "options" do
+    before do
+      @options = @knife_openstack_create.options
+    end
+
+    it "ensures default options" do
+      @options[:bootstrap_protocol][:default].should == nil
+      @options[:distro][:default].should == 'chef-full'
+      @options[:floating_ip][:default].should == '-1'
+      @options[:host_key_verify][:default].should == true
+      @options[:private_network][:default].should == false
+      @options[:run_list][:default].should == []
+      @options[:security_groups][:default].should == ['default']
+      @options[:server_create_timeout][:default].should == 600
+      @options[:ssh_port][:default].should == '22'
+      @options[:ssh_user][:default].should == 'root'
+    end
+  end
+
   describe "run" do
     before do
       @openstack_servers.should_receive(:create).and_return(@new_openstack_server)
@@ -96,6 +115,7 @@ describe Chef::Knife::OpenstackServerCreate do
   describe "when configuring the bootstrap process" do
     before do
       @knife_openstack_create.config[:ssh_user] = "ubuntu"
+      @knife_openstack_create.config[:ssh_port] = "44"
       @knife_openstack_create.config[:identity_file] = "~/.ssh/key.pem"
       @knife_openstack_create.config[:chef_node_name] = "blarf"
       @knife_openstack_create.config[:template_file] = '~/.chef/templates/my-bootstrap.sh.erb'
@@ -118,6 +138,10 @@ describe Chef::Knife::OpenstackServerCreate do
       @bootstrap.config[:ssh_user].should == 'ubuntu'
     end
 
+    it "configures the bootstrap to use the correct ssh_port" do
+      @bootstrap.config[:ssh_port].should == '44'
+    end
+
     it "configures the bootstrap to use the correct ssh identity file" do
       @bootstrap.config[:identity_file].should == "~/.ssh/key.pem"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-openstack
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OpenStack Compute Support for Chef's Knife Command