knife-joyent 0.3.0 → 0.3.1

data/CHANGES.md

@@ -1,6 +1,14 @@
 knife-joyent Changelog
 ===
 
+## 0.3.2 (master)
+
+
+## 0.3.1
+
+- GH-55 Allow disabling SSL certificate verification + tags compatibility for SDC 6.5
+- GH-53 Command line arguments now properly takes precidense over config defined in knife.rb
+
 ## 0.3.0
 
 - GH-49 Network api support

data/README.md

@@ -115,6 +115,11 @@ can be overridden in knife.rb as follows:
 
 Some command line options to knife-joyent subcommands may depend on the Joyent API version set.
 
+**``joyent_verify_peer``**
+
+Set to false to Disable SSL Cert verification, required if the CloudAPI instance
+uses a self-signed cert.
+
 **``provisioner``**
 
 Machines provisioned will be tagged with key ``provisioner`` containing the value specified.

data/lib/chef/knife/joyent_base.rb

@@ -54,21 +54,29 @@ class Chef
       end
 
       def connection
+        if (Chef::Config[:knife][:joyent_verify_peer] rescue nil)
+          Excon.defaults[:ssl_verify_peer] = false
+        end
+
         @connection ||= begin
            Fog::Compute.new(
             :provider => 'Joyent',
-            :joyent_username => Chef::Config[:knife][:joyent_username],
-            :joyent_password => Chef::Config[:knife][:joyent_password],
-            :joyent_keyname => Chef::Config[:knife][:joyent_keyname],
-            :joyent_keyfile => Chef::Config[:knife][:joyent_keyfile],
-
-            :joyent_url => Chef::Config[:knife][:joyent_api_url],
-            :joyent_version => Chef::Config[:knife][:joyent_version]
+            :joyent_username => locate_config_value(:joyent_username),
+            :joyent_password => locate_config_value(:joyent_password),
+            :joyent_keyname => locate_config_value(:joyent_keyname),
+            :joyent_keyfile => locate_config_value(:joyent_keyfile),
 
+            :joyent_url => locate_config_value(:joyent_api_url),
+            :joyent_version => locate_config_value(:joyent_version)
           )
         end
       end
 
+      def locate_config_value(key)
+        key = key.to_sym
+        config[key] || Chef::Config[:knife][key]
+      end
+
       def msg_pair(label, value = nil)
         if value && !value.empty?
           puts "#{ui.color(label, :cyan)}: #{value}"

data/lib/chef/knife/joyent_server_list.rb

@@ -43,7 +43,10 @@ class Chef
           servers << s.ips.join(" ")
           servers << "#{s.memory/1024} GB".to_s
           servers << "#{s.disk/1024} GB".to_s
-          servers << s.tags.map { |k, v| "#{k}:#{v}" }.join(' ')
+
+          if (servers.tags rescue nil)
+            servers << s.tags.map { |k, v| "#{k}:#{v}" }.join(' ')
+          end
         end
 
         puts ui.list(servers, :uneven_columns_across, 9)

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -124,4 +124,3 @@ signing_key:
 specification_version: 3
 summary: Joyent CloudAPI Support for Chef's Knife Command
 test_files: []
-has_rdoc: true