knife-brightbox 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9211b0bdcd00c20988b3ad142eb7f3f7b6d21853
-  data.tar.gz: 6c393315043b04be91e9ce69710cb353b3dce9f9
+  metadata.gz: dce55a715abf2d75fa4b25c31f34ebe75222bb9a
+  data.tar.gz: 910840b1f2a92e6da074e75ba8dd1b284aca80b7
 SHA512:
-  metadata.gz: d38c728b618e3c23662f226bf816cf344a271ff63d055cd32305d42e0fa7f7b5bb82244fe731e0cfbeab186c085f1a1b0f1e3184784c3e61a2e8e7bb2cab7e26
-  data.tar.gz: 145716aba33f00d23c700feb5aba592dd82114c4323806b422953fbd5fcf9fe327f9980ab370c81e2dbfb6ed2b3d3033062e6f3b3c5ec7b848533023f4dafba8
+  metadata.gz: 313401b2f124d086c4f6be16007719dd9c98515627630363a286a1e83640a79ce9e395e1bf0894467aa4a7aa07959c520da97b174a46b66d8dad1318a693e46e
+  data.tar.gz: 819977b6db8bac6d91f50a8f7386ba18c4f7835875a38c5073351922e130e9dd60b37b2f794964e91fdf89d6f977a88d19dd54c745fea9cdc17fcca7c8340127

data/CHANGELOG

@@ -1,3 +1,7 @@
+# 0.8.0
+
+* Allow configuring of SSH port when creating new server
+
 # 0.7.1
 
 * Allows overriding of attributes defined in `.chef/knife.rb` (@gregkare)

data/README.rdoc

@@ -68,6 +68,8 @@ Provisions a new server in the Brightbox Cloud and then perform a Chef bootstrap
 
 You can specify the Brightbox zone your new server will use using the `--zone` switch. By default it is `gb1-a`. It can also be `gb1-b` at the time of this writing. See `knife brightbox zone list` to request a current list from the API.
 
+You can specify the ssh port to connect to using the `--ssh-port` switch. By default it is `22`.
+
 == knife brightbox server delete
 
 Deletes an existing server in the currently configured Brightbox Cloud account by the server/instance id. You can find the instance id by entering 'knife brightbox server list'. You can specify the `--purge` flag to delete the associated node and client objects from the Chef server along with the cloup ip.

data/lib/chef/knife/brightbox_server_create.rb

@@ -110,6 +110,13 @@ class Chef
         :description => "The ssh username; default is 'root'",
         :default => "root"
 
+      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.to_i }
+
       option :first_boot_attributes,
         :short => "-j JSON_ATTRIBS",
         :long => "--json-attributes",
@@ -136,7 +143,7 @@ class Chef
         :proc => Proc.new { |z| Chef::Config[:zone] = z }
 
       def tcp_test_ssh(hostname)
-        tcp_socket = TCPSocket.new(hostname, 22)
+        tcp_socket = TCPSocket.new(hostname, config[:ssh_port])
         readable = IO.select([tcp_socket], nil, nil, 5)
         if readable
           Chef::Log.debug("sshd accepting connections on #{hostname}, banner is #{tcp_socket.gets}")
@@ -222,6 +229,7 @@ class Chef
         bootstrap.name_args = [server.cloud_ips.first['public_ip']]
         bootstrap.config[:run_list] = config[:run_list]
         bootstrap.config[:ssh_user] = config[:ssh_user] || "root"
+        bootstrap.config[:ssh_port] = config[:ssh_port]
         bootstrap.config[:identity_file] = config[:identity_file]
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.name || server.id
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)

data/lib/knife-brightbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Sergio Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog