chef-metal 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f75d0eea4f0ab10f62670396310edd0576e866f
-  data.tar.gz: 6dd9f7a2319e535163b35772f1efa62b6d32bd7e
+  metadata.gz: f78844f0b35265a0587a59130f2cc18f094c91ee
+  data.tar.gz: 4456458de1b2708269d784c6dd1c42559353b861
 SHA512:
-  metadata.gz: bdb8c0681270de564b0adc840e73a382c8bef6a1aa358692e81b80b480f670d6be31c1128f87e0ce8b6774168a74d0731d3975264d7a2e7ed0b97ac13455d924
-  data.tar.gz: a58484ee3eafe1c46914fe624587c2476e16f42c9b935f7bdcae29b6e409354745a7e57884ed97fc86031174bf6344caf95096b7de0c745410bdf4fc50e7dadb
+  metadata.gz: dbec23e421ace3000e3f09dca9142120683fbd5201d4187adf73f8381b36a1d4863a803a716e8bc77e69b0ce69b1d6c17980ea8fbdc355d37534d7a452a6de62
+  data.tar.gz: 3652afb4356159e48a3103c6fe1e9f6477219074453cd9fd11f164dce9c44f717f80c75e23d2d78f7202d7151c9f110e731d7e9aea109b816f64da67a0e38b0a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Chef Metal Changelog
 
+## 0.7 (4/5/2014)
+
+- Change transport interface: add ability to rewrite URL instead of forwarding ports
+
 ## 0.6 (4/4/2014)
 
 - Vagrant and Fog provisioners moved to their own gems (chef-metal-vagrant and chef-metal-fog)

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -22,11 +22,7 @@ module ChefMetal
 
         # If the chef server lives on localhost, tunnel the port through to the guest
         chef_server_url = machine_resource.chef_server[:chef_server_url]
-        url = URI(chef_server_url)
-        # TODO IPv6
-        if is_localhost(url.host)
-          machine.forward_remote_port_to_local(url.port, url.port)
-        end
+        chef_server_url = machine.make_url_available_to_remote(chef_server_url)
 
         # Create client.rb and client.pem on machine
         content = client_rb_content(chef_server_url, machine.node['name'])

data/lib/chef_metal/machine/basic_machine.rb

@@ -67,8 +67,8 @@ module ChefMetal
         end
       end
 
-      def forward_remote_port_to_local(remote_port, local_port)
-        transport.forward_remote_port_to_local(remote_port, local_port)
+      def make_url_available_to_remote(local_url)
+        transport.make_url_available_to_remote(local_url)
       end
 
       def disconnect

data/lib/chef_metal/machine.rb

@@ -17,7 +17,6 @@ module ChefMetal
       raise "converge not overridden on #{self.class}"
     end
 
-
     def execute(action_handler, command)
       raise "execute not overridden on #{self.class}"
     end
@@ -67,9 +66,10 @@ module ChefMetal
       raise "get_attributes not overridden on #{self.class}"
     end
 
-    # Forward a remote port to local for the duration of the current connection
-    def forward_remote_port_to_local(remote_port, local_port)
-      raise "forward_remote_port_to_local not overridden on #{self.class}"
+    # Ensure the given URL can be reached by the remote side (possibly by port forwarding)
+    # Must return the URL that the remote side can use to reach the local_url
+    def make_url_available_to_remote(local_url)
+      raise "make_url_available_to_remote not overridden on #{self.class}"
     end
 
     def disconnect

data/lib/chef_metal/transport/ssh.rb

@@ -1,4 +1,6 @@
 require 'chef_metal/transport'
+require 'uri'
+require 'socket'
 
 module ChefMetal
   class Transport
@@ -94,10 +96,15 @@ module ChefMetal
         end
       end
 
-      def forward_remote_port_to_local(remote_port, local_port)
-        # TODO IPv6
-        Chef::Log.debug("Forwarding local server 127.0.0.1:#{local_port} to port #{remote_port} on #{username}@#{host}")
-        session.forward.remote(local_port, "127.0.0.1", remote_port)
+      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]'
+          # TODO IPv6
+          Chef::Log.debug("Forwarding local server 127.0.0.1:#{uri.port} to port #{uri.port} on #{username}@#{host}")
+          session.forward.remote(uri.port, "127.0.0.1", uri.port)
+        end
+        local_url
       end
 
       def disconnect

data/lib/chef_metal/transport.rb

@@ -20,9 +20,8 @@ module ChefMetal
       write_file(path, IO.read(local_path))
     end
 
-    # Forward requests to a port on the guest to a server on the host
-    def forward_remote_port_to_local(remote_port, local_port)
-      raise "forward_remote_port_to_local not overridden on #{self.class}"
+    def make_url_available_to_remote(local_url)
+      raise "make_url_available_to_remote not overridden on #{self.class}"
     end
 
     def disconnect

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef