knife-rackspace 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3424287dbc7b2fc0cacf8f5d59f5f270620f114f
-  data.tar.gz: 622cf2499996948177d909c495ca9d036a9cf149
+  metadata.gz: 7811a3b0274045c7eef68f84c9c98937c921da04
+  data.tar.gz: 1ac4c493912be152364421c62bc340bf678dfc95
 SHA512:
-  metadata.gz: a55cb84a25d9374ec39003f52312c58960e907eeff6f68612fd63e77d103ac773261c23a384fc12389b1ddcc079d893440228c6f69eac81a529509a550bc57fc
-  data.tar.gz: c727dbaa60bc04a9f2c5899c193cad18555e2ec9bcbd5493096b83a72a5dab724130bd913775e91b8dc59fd2ddae2b7146a0552f0395677b4fb670ab75027037
+  metadata.gz: 9110fa351cbb6d96c601338209879c47931fe5a4546f977a6e16a332dc91db361ab6951ed368db7892a01c878e9362b30efdaf2a0b101b3e08a1816bf38d3ffd
+  data.tar.gz: f999ed0ce979560b67ee47135a46fc89ff8da14a5aedff4fc9163d613719fe654787a5d11177c890b01e6c256c89be93e47019dd06491b3fd96aafa4f9ee7a5a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.0.3
+* Fix to encrypted_data_bag_secret and encrypted_data_bag_secret_file options (#138)
+* Fix em-winrm dependencies and close TCP sockets (#134)
+
+## v1.0.2
+* Fix issue in error message when no flavor is supplied (#132)
+
 ## v1.0.1
 * Fix Server List exception (#131)
 * Fix bug preferring knife over CLI configurations items (#128)

data/lib/chef/knife/rackspace_server_create.rb

@@ -45,7 +45,7 @@ class Chef
         :long => "--flavor FLAVOR",
         :description => "The flavor of server; default is 2 (512 MB)",
         :proc => Proc.new { |f| Chef::Config[:knife][:flavor] = f.to_s },
-        :default => 2
+        :default => "2"
 
       option :image,
         :short => "-I IMAGE",
@@ -258,10 +258,15 @@ class Chef
         :proc => Proc.new { |v| Chef::Config[:knife][:rackspace_ssh_keypair] = v },
         :default => nil
 
+      option :secret,
+        :long => "--secret",
+        :description => "The secret key to us to encrypt data bag item values",
+        :proc => lambda { |s| Chef::Config[:knife][:secret] = s }
+
       option :secret_file,
         :long => "--secret-file SECRET_FILE",
         :description => "A file containing the secret key to use to encrypt data bag item values",
-        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
+        :proc => lambda { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       option :bootstrap_vault_file,
         :long        => "--bootstrap-vault-file VAULT_FILE",
@@ -284,10 +289,9 @@ class Chef
 
       def load_winrm_deps
         require "winrm"
-        require "em-winrm"
+        require "chef/knife/winrm"
         require "chef/knife/bootstrap_windows_winrm"
         require "chef/knife/core/windows_bootstrap_context"
-        require "chef/knife/winrm"
       end
 
       def tcp_test_ssh(server, bootstrap_ip)
@@ -351,8 +355,8 @@ class Chef
       end
 
       def tcp_test_winrm(hostname, port)
-        TCPSocket.new(hostname, port)
-        return true
+        tcp_socket = TCPSocket.new(hostname, port)
+        true
       rescue SocketError
         sleep 2
         false
@@ -369,6 +373,7 @@ class Chef
       rescue Errno::ENETUNREACH
         sleep 2
         false
+        tcp_socket && tcp_socket.close
       end
 
       def run
@@ -601,11 +606,10 @@ class Chef
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:first_boot_attributes] = locate_config_value(:first_boot_attributes)
         bootstrap.config[:bootstrap_proxy] = locate_config_value(:bootstrap_proxy)
-#        TODO: Remove dead code. There's no command line parameter for these two.
-#        bootstrap.config[:encrypted_data_bag_secret] = config[:encrypted_data_bag_secret]
-#        bootstrap.config[:encrypted_data_bag_secret_file] = config[:encrypted_data_bag_secret_file]
+        bootstrap.config[:encrypted_data_bag_secret] = locate_config_value(:secret)
+        bootstrap.config[:encrypted_data_bag_secret_file] = locate_config_value(:secret_file)
         bootstrap.config[:secret] = locate_config_value(:secret)
-        bootstrap.config[:secret_file] = locate_config_value(:secret_file) || ""
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file)
 
         Chef::Config[:knife][:hints] ||= {}
         Chef::Config[:knife][:hints]["rackspace"] ||= {}

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows