knife-joyent 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2fcd7ed58b4dc501d0499506fe5086d13d2d25
-  data.tar.gz: 9271025e54762e4a8c4d424fe09f87f832570c70
+  metadata.gz: 97840b8a3ec364a32ca0735ec200d7f0a0823351
+  data.tar.gz: 298e8434baa3a3c1d469fa0a39b748c3f04af02f
 SHA512:
-  metadata.gz: ff52fed01168a0c8c36a71ba3e0ad3b2be6fcc1bc62645ba3e7d659ed34824ec28df21cbe4f06b1298c3d77eb0ecd6743e1cee18ef4c4daa0742b18f62d91df0
-  data.tar.gz: e7836fd3d2caeaf2684868409c04a57005c76b711fe45b684734bec5002be0dead2603c88c1b59316cb6cbee47afa9a552de967245358a70f19a1a0075f43403
+  metadata.gz: b24792faf5a1d8b15c6e1ba29630a5f1213fe95872d863b94664dc52f0de3017204b117916584b4d2df4044378ac2d1e6670987c5f4212fd09088eb17079f0b0
+  data.tar.gz: 16b9f5f771f78863116eb109397c467e459b348ca0e3b1d27da71c3bd711570575f617c9a930ab503319566fd859ab707f4c6ff361d4d494ebf9144ccb2a7da2

data/README.md

@@ -110,9 +110,18 @@ to automatically unlock the key for authentication.
 
 **``joyent_api_url``**
 
-Specify a custom API endpoint, this is required if you want to specify
-where you want to provision your machines, or if you are using knife with a
-provider powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
+Specifies a custom CloudAPI endpoint, this is required if you want to manage
+machines located in another datacenter or if you want to interface with any CloudAPI 
+instance powered by [SmartDataCenter](http://www.joyent.com/products/smartdatacenter/).
+
+Defaults to us-west-1
+
+Available datacenters (currently) are:
+
+    https://eu-ams-1.api.joyentcloud.com
+    https://us-west-1.api.joyentcloud.com
+    https://us-sw-1.api.joyentcloud.com
+    https://us-east-1.api.joyentcloud.com
 
     # Defaults to https://us-west-1.api.joyentcloud.com/
     knife[:joyent_api_url] = "https://us-sw-1.api.joyentcloud.com/"

data/lib/chef/knife/joyent_server_create.rb

@@ -19,7 +19,7 @@ class Chef
 
       option :server_name,
         :short => "-S NAME",
-        :long => "--server-name <name>",
+        :long => "--server-name NAME",
         :description => "The Joyent server name (may contain letters, numbers, dashes, and periods)"
 
       option :chef_node_name,
@@ -104,6 +104,13 @@ class Chef
         :boolean => true,
         :default => false
 
+      option :ssh_gateway,
+        :short => "-w GATEWAY",
+        :long => "--ssh-gateway GATEWAY",
+        :description => "The ssh gateway server",
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
+
+
       def is_linklocal(ip)
         linklocal = IPAddr.new "169.254.0.0/16"
         return linklocal.include?(ip)
@@ -238,9 +245,6 @@ class Chef
         Chef::Log.debug("Bootstrap ssh_user = #{config[:ssh_user]}")
         bootstrap.config[:ssh_user] = config[:ssh_user]
 
-        Chef::Log.debug("Bootstrap identity_file = #{config[:identity_file]}")
-        bootstrap.config[:identity_file] = config[:identity_file]
-
         Chef::Log.debug("Bootstrap chef_node_name = #{config[:chef_node_name]}")
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
 
@@ -259,6 +263,13 @@ class Chef
         Chef::Log.debug("Bootstrap no_host_key_verify = #{config[:no_host_key_verify]}")
         bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
 
+        Chef::Log.debug("Bootstrap identity_file = #{config[:identity_file]}")
+        bootstrap.config[:identity_file] = config[:identity_file]
+
+        Chef::Log.debug("Bootstrap ssh_gateway= #{config[:ssh_gateway]}")
+        bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
+
+
         Chef::Log.debug("Bootstrap json_attributes = #{config[:json_attributes]}")
         bootstrap.config[:first_boot_attributes] = config[:json_attributes]
 
@@ -296,7 +307,7 @@ class Chef
         # add some validation here ala knife-ec2
         unless config[:server_name] || config[:chef_node_name]
           ui.error("You have not provided a valid server or node name.")
-          show_usage
+          puts show_usage
           exit 1
         end
       end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Kevin Chan