clc-fork-chef-metal 0.12.1.alpha.4 → 0.13.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 063dc6912cd4c2b675e871152f4021d5c06a2aa9
-  data.tar.gz: 79786e362cbbf63faef0448d5af5302b889fb205
+  metadata.gz: 92fd9ce1269e598cb791750506afc09fe1ebd514
+  data.tar.gz: 51fbc3e51bb706e79995554ee1f9f433077f2b16
 SHA512:
-  metadata.gz: 1e6ec4090657451ed8cc898ab673c8c810a81bd969a577f3b0bfc06dc8aef0e733c9ec9d6a068ebd6962015f2b86033715e8649d9ab71a3daf4c48d1a01dac0e
-  data.tar.gz: 47b27089194d5f676aaade9d7790569c3617e899fd5b24041995f2ee080e1caa4f5f7ff8babc6bbb49d8c80580aa7b1bfb61e3b228b8caeda7db0b63421b5941
+  metadata.gz: 84fc7691daf6f62d12d8f8bed0e621a3c62b2f195efbb6afb9c9efa29d6615290c51894c588bc0005f1ac62e78ebb7aa5d5b10decd2013896401712450e191e1
+  data.tar.gz: f7dfa7d4df6eaecd8635118c9a2afc2e60ae25c5b98b94f1d53a4704d239ea323ff02e3dab61a44b8225fb7eabf99d772548b1d1a24fdc2e439c614cddd44fcc

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 (@MrMMorris)
+
 ## 0.12.1 (6/18/2014)
 
 - fix machine_batch action :setup

data/README.md

@@ -13,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
 ----------
 
@@ -218,17 +225,33 @@ 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:
+```
+{
+  "users": [
+    "pivotal" # This is an internal superuser for Hosted/Enterprise Chef
+  ],
+  "groups": [
+    "clients" # This is what you need to add
+  ]
+}
+```
+
+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.rb

@@ -71,9 +71,13 @@ module ChefMetal
   end
 
   def self.connect_to_machine(machine_spec, config = Cheffish.profiled_config)
+    chef_server = Cheffish.default_chef_server(config)
+    if machine_spec.is_a?(String)
+      machine_spec = ChefMachineSpec.get(machine_spec, chef_server)
+    end
     driver = driver_for_url(machine_spec.driver_url, config)
     if driver
-      machine_options = { :convergence_options => { :chef_server => Cheffish.default_chef_server(config) } }
+      machine_options = { :convergence_options => { :chef_server => chef_server } }
       machine_options = Cheffish::MergedConfig.new(config[:machine_options], machine_options) if config[:machine_options]
       driver.connect_to_machine(machine_spec, machine_options)
     else

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/transport/ssh.rb

@@ -1,4 +1,5 @@
 require 'chef_metal/transport'
+require 'chef/log'
 require 'uri'
 require 'socket'
 require 'timeout'
@@ -108,14 +109,20 @@ module ChefMetal
 
       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'
-          unless session.forward.active_remotes.any? { |port, bind| port == uri.port && bind == uri.host }
-            Chef::Log.debug("Forwarding local server #{uri.host}:#{uri.port} to port #{uri.port} on #{username}@#{self.host}")
-            session.forward.remote(uri.port, uri.host, uri.port)
+        if is_local_machine(uri.host)
+          port, host = forward_port(uri.port, uri.host, uri.port, 'localhost')
+          if !port
+            # Try harder if the port is already taken
+            port, host = forward_port(uri.port, uri.host, 0, 'localhost')
+            if !port
+              raise "Error forwarding port: could not forward #{uri.port} or 0"
+            end
           end
+          uri.host = host
+          uri.port = port
         end
-        local_url
+        Chef::Log.info("Port forwarded: local URL #{local_url} is available to #{self.host} as #{uri.to_s} for the duration of this SSH connection.")
+        uri.to_s
       end
 
       def disconnect
@@ -232,6 +239,50 @@ module ChefMetal
           raise InitialConnectTimeout.new($!)
         end
       end
+
+      def is_local_machine(host)
+        local_addrs = Socket.ip_address_list
+        host_addrs = Addrinfo.getaddrinfo(host, nil)
+        local_addrs.any? do |local_addr|
+          host_addrs.any? do |host_addr|
+            local_addr.ip_address == host_addr.ip_address
+          end
+        end
+      end
+
+      # Forwards a port over the connection, and returns the
+      def forward_port(local_port, local_host, remote_port, remote_host)
+        # This bit is from the documentation.
+        if session.forward.respond_to?(:active_remote_destinations)
+          got_remote_port, remote_host = session.forward.active_remote_destinations[[local_port, local_host]]
+          if !got_remote_port
+            Chef::Log.debug("Forwarding local server #{local_host}:#{local_port} to #{username}@#{self.host}")
+
+            session.forward.remote(local_port, local_host, remote_port, remote_host) do |actual_remote_port|
+              got_remote_port = actual_remote_port || :error
+              :no_exception # I'll take care of it myself, thanks
+            end
+            # Kick SSH until we get a response
+            session.loop { !got_remote_port }
+            if got_remote_port == :error
+              return nil
+            end
+          end
+          [ got_remote_port, remote_host ]
+        else
+          @forwarded_ports ||= {}
+          remote_port, remote_host = @forwarded_ports[[local_port, local_host]]
+          if !remote_port
+            Chef::Log.debug("Forwarding local server #{local_host}:#{local_port} to #{username}@#{self.host}")
+            old_active_remotes = session.forward.active_remotes
+            session.forward.remote(local_port, local_host, local_port)
+            session.loop { !(session.forward.active_remotes.length > old_active_remotes.length) }
+            remote_port, remote_host = (session.forward.active_remotes - old_active_remotes).first
+            @forwarded_ports[[local_port, local_host]] = [ remote_port, remote_host ]
+          end
+          [ remote_port, remote_host ]
+        end
+      end
     end
   end
 end

data/lib/chef_metal/transport/winrm.rb

@@ -80,14 +80,11 @@ $file.Close
       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'
-        #   unless session.forward.active_remotes.any? { |port, bind| port == uri.port && bind == uri.host }
-        #     Chef::Log.debug("Forwarding local server #{uri.host}:#{uri.port} to port #{uri.port} on #{username}@#{self.host}")
-        #     session.forward.remote(uri.port, uri.host, uri.port)
-        #   end
-        # end
+        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
 

data/lib/chef_metal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-fork-chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.12.1.alpha.4
+  version: 0.13.alpha.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef