chef-metal 0.12.1 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73917076444ad1bda8ffa1d5b3a2d44c6f13e401
-  data.tar.gz: 04f07c5b3d36891a3c961b1d8effd2154e34f71b
+  metadata.gz: 5f7a30676d9791f178e7448693969b295a85d5f4
+  data.tar.gz: cac264ccd9b787d7ff1a799f3b0994973eb06a1a
 SHA512:
-  metadata.gz: 102130f0959c12ce7c6b22d3d1ef15bd30aed149301af19db398d83bc4eba212fe7aceda10d2c27232e65f4c5fe341787d49a4703fe2a3c693f91564c8245f1a
-  data.tar.gz: 6c2a7613ddd0da1090402c152579fde5de9279204ddd06a477e6c5d0e2fcd1b1cd4d342f99a84d32a7edce9c8281733aed233c9327c20879f7673df3f97ae585
+  metadata.gz: 31858346827c13c25a8fb8a5a6e222a424db9c610a86e643971e5a4620fb9b863eb8418c3235830d0d519870e07a519359e548a6e94099c6cc17b50251cd2255
+  data.tar.gz: fec942a369b4d2e82a33090bcf47caa51cda90346c9f867ac00d5633d95f9c633e98a786ddb997d43466623ca184342845e1e1ad7756d1f3444b49ef713f6c31

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Chef Metal Changelog
 
+## 0.13 (6/17/2014)
+
+- make winrm work again (@mwrock)
+- add bootstrap_proxy as a convergence_option for when target machines require a proxy
+
 ## 0.12.1 (6/18/2014)
 
 - fix machine_batch action :setup

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/opscode/chef-metal.png?label=ready&title=Ready)](https://waffle.io/opscode/chef-metal)
 Chef Metal
 ==========
 
@@ -12,6 +13,13 @@ Date       | Blog
 3/4/2014   | [Chef Metal 0.2: Overview](http://www.getchef.com/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
 12/20/2013 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
 
+Documentation
+-------------
+* [Configuration](https://github.com/opscode/chef-metal/blob/master/docs/configuration.md#configuring-and-using-metal-drivers)
+* [Writing Drivers](https://github.com/opscode/chef-metal/blob/master/docs/building_drivers.md#writing-drivers)
+* [Embedding](https://github.com/opscode/chef-metal/blob/master/docs/embedding.md)
+* [Providers](https://github.com/opscode/chef-metal/blob/master/docs/providers)
+
 Try It Out
 ----------
 
@@ -217,17 +225,28 @@ with_chef_server "https://chef-server.example.org",
   :signing_key_filename => Chef::Config[:client_key]
 ```
 
+**Note for Hosted/Enterprise Chef Servers**
+
+Currently, you will need to add the 'clients' group to the 'admin' group in order for machine provisioning to work:
+
+```
+knife edit /groups/admin.json -e <editor>
+```
+Then add:
+```
+ "groups": [
+    "clients"
+  ]
+```
+
+This can also be done through the Chef Server web UI (Administration tab > Groups > select admins Group > Add 'clients'
+
+
 Kitchen
 -------
 
 Chef Metal also works with Test Kitchen, allowing you to test entire clusters, not just machines!  The repository for the kitchen-metal gem is https://github.com/doubt72/kitchen-metal.
 
-Documentation
--------------
-* [Configuration](https://github.com/opscode/chef-metal/blob/master/docs/configuration.md#configuring-and-using-metal-drivers)
-* [Writing Drivers](https://github.com/opscode/chef-metal/blob/master/docs/building_drivers.md#writing-drivers)
-* [Embedding](https://github.com/opscode/chef-metal/blob/master/docs/embedding.md)
-
 Bugs and The Plan
 -----------------
 

data/lib/chef/provider/machine.rb

@@ -20,6 +20,9 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
     if current_driver && current_driver.driver_url != new_driver.driver_url
       raise "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
     end
+    if !new_driver
+      raise "Driver not specified for machine #{machine_spec.name}"
+    end
     new_driver.allocate_machine(action_handler, machine_spec, new_machine_options)
     machine_spec.save(action_handler)
   end

data/lib/chef/provider/machine_batch.rb

@@ -120,6 +120,8 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
         end
         result[driver] ||= {}
         result[driver][m[:spec]] = m[:machine_options].call(driver)
+      else
+        raise "No driver specified for #{m[:spec].name}"
       end
     end
     result

data/lib/chef_metal/convergence_strategy/install_msi.rb

@@ -9,7 +9,7 @@ module ChefMetal
       def initialize(convergence_options, config)
         super
         @install_msi_url = convergence_options[:install_msi_url] || 'http://www.opscode.com/chef/install.msi'
-        @install_msi_path = convergence_options[:install_msi_path] || "%TEMP%\\#{File.basename(@install_msi_url)}"
+        @install_msi_path = convergence_options[:install_msi_path] || "$env:TEMP\\#{File.basename(@install_msi_url)}"
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 

data/lib/chef_metal/convergence_strategy/install_sh.rb

@@ -14,11 +14,13 @@ module ChefMetal
         super(convergence_options, config)
         @install_sh_url = convergence_options[:install_sh_url] || 'http://www.opscode.com/chef/install.sh'
         @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
+        @bootstrap_env = convergence_options[:bootstrap_proxy] ? "http_proxy=#{convergence_options[:bootstrap_proxy]}" : ""
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 
       attr_reader :install_sh_url
       attr_reader :install_sh_path
+      attr_reader :bootstrap_env
 
       def setup_convergence(action_handler, machine)
         super
@@ -28,7 +30,7 @@ module ChefMetal
           # TODO ssh verification of install.sh before running arbtrary code would be nice?
           @@install_sh_cache[install_sh_url] ||= Net::HTTP.get(URI(install_sh_url))
           machine.write_file(action_handler, install_sh_path, @@install_sh_cache[install_sh_url], :ensure_dir => true)
-          machine.execute(action_handler, "bash #{install_sh_path}")
+          machine.execute(action_handler, "bash -c '#{bootstrap_env} bash #{install_sh_path}'")
         end
       end
 

data/lib/chef_metal/recipe_dsl.rb

@@ -39,15 +39,15 @@ class Chef
         end
       end
 
-      @@next_machine_batch_index = 1
+      @@next_machine_batch_index = 0
 
       def machine_batch_default_name
+        @@next_machine_batch_index += 1
         if @@next_machine_batch_index > 1
           "default#{@@next_machine_batch_index}"
         else
           "default"
         end
-        @@next_machine_batch_index += 1
       end
 
       def machine_batch(name = nil, &block)

data/lib/chef_metal/transport/winrm.rb

@@ -62,7 +62,30 @@ $file.Close
       end
 
       def escape(string)
-        "'#{string.gsub("'", "''")}'"
+        "\"#{string.gsub("\"", "`\"")}\""
+      end
+
+      def available?
+        # If you can't pwd within 10 seconds, you can't pwd
+        execute('pwd', :timeout => 10)
+        true
+      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, ::WinRM::WinRMHTTPTransportError, ::WinRM::WinRMWebServiceError, ::WinRM::WinRMWSManFault
+        Chef::Log.debug("unavailable: network connection failed or broke: #{$!.inspect}")
+        disconnect
+        false
+      rescue ::WinRM::WinRMAuthorizationError
+        Chef::Log.debug("unavailable: winrm authentication error: #{$!.inspect} ")
+        disconnect
+        false
+      end
+
+      def make_url_available_to_remote(local_url)
+        uri = URI(local_url)
+        host = Socket.getaddrinfo(uri.host, uri.scheme, nil, :STREAM)[0][3]
+        if host == '127.0.0.1' || host == '::1'
+          raise 'Unable to converge locally via winrm. Local converge is currently only supported with SSH. You may only converge with winrm against a chef-server.'
+        end
+        local_url
       end
 
       protected
@@ -94,6 +117,7 @@ $file.Close
         attr_reader :exitstatus
         attr_reader :command
         attr_reader :options
+        attr_reader :config
 
         def error!
           if exitstatus != 0

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.12.1'
+  VERSION = '0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: '0.13'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement