chef-metal-lxc 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed7dfed2acc5f5c14b12786111cf062074f2165
-  data.tar.gz: c34889c04ef95bea3ae6b036a24a39bcd270b654
+  metadata.gz: 6ad611e66ac9a796b8a0c125031d1cf32848a5ed
+  data.tar.gz: 0cfc4b4906340f4d689d1ec647fa8882429a4eb9
 SHA512:
-  metadata.gz: a93dab3facce1903bb30177604f07140881749e28f24668cc3e8f28de1c73f3a2b893b36ec7a3539a0de83c2286efa6247843bbdda0a29bad4476c72f2e4aa19
-  data.tar.gz: e717b1b724124d7e1d0c9e34cdb63b1b7bee0ebc7e9c2145395020134e23f6b1243215cd39346d0111d28600ca295849e16b4048fc708cc1d3b842ce7f40438a
+  metadata.gz: 475be1de802665c6f8c963ff2694acd434fdbbe24709fa9f24cc2477a74aee4a50c1041eecca5e67f1fc13f8bcd7b508d9a4927f92cc0347234a7a6ecbc435f2
+  data.tar.gz: d6fdd96c32aed28b57c37a74c107aa773b9718dace9c875f6729af72bddce4bf635acddb3eee1c6196ee0ab427ab488e0890c37ebe7d8809ba4be864c5fd0536

data/lib/chef_metal_lxc/lxc_transport.rb

@@ -4,6 +4,8 @@ require 'chef/mixin/shell_out'
 require 'lxc/extra/proxy_client_side'
 require 'lxc/extra/proxy_server_side'
 require 'lxc/extra/channel'
+require 'uri'
+require 'socket'
 
 module ChefMetalLXC
   class LXCTransport < ChefMetal::Transport
@@ -51,32 +53,39 @@ module ChefMetalLXC
       end
     end
 
-    def forward_remote_port_to_local(remote_port, local_port)
-      Chef::Log.debug("Forwarding container port #{remote_port} to local port #{local_port}")
-      # Create the channel that will let the container and the host talk to each other
-      channel = LXC::Extra::Channel.new
+    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]'
+
+        Chef::Log.debug("Forwarding container port #{uri.port} to local port #{uri.port}")
+        # Create the channel that will let the container and the host talk to each other
+        channel = LXC::Extra::Channel.new
+
+        # Start the container side of the proxy, listening for client connections
+        pid = container.attach do
+          begin
+            server = TCPServer.new('127.0.0.1', uri.port)
+            proxy = LXC::Extra::ProxyClientSide.new(channel, server)
+            proxy.start
+          rescue
+            Chef::Log.error("ERROR in proxy (container side): #{$!}\n#{$!.backtrace.join("\n")}")
+            raise
+          end
+        end
 
-      # Start the container side of the proxy, listening for client connections
-      pid = container.attach do
-        begin
-          server = TCPServer.new('127.0.0.1', remote_port)
-          proxy = LXC::Extra::ProxyClientSide.new(channel, server)
+        # Start the host side of the proxy, which contacts the real server
+        thread = Thread.new do
+          proxy = LXC::Extra::ProxyServerSide.new(channel) do
+            TCPSocket.new('127.0.0.1', uri.port)
+          end
           proxy.start
-        rescue
-          Chef::Log.error("ERROR in proxy (container side): #{$!}\n#{$!.backtrace.join("\n")}")
-          raise
         end
-      end
 
-      # Start the host side of the proxy, which contacts the real server
-      thread = Thread.new do
-        proxy = LXC::Extra::ProxyServerSide.new(channel) do
-          TCPSocket.new('127.0.0.1', local_port)
-        end
-        proxy.start
-      end
+        @port_forwards << [ pid, thread, channel ]
 
-      @port_forwards << [ pid, thread, channel ]
+      end
+      local_url
     end
 
     def read_file(path)

data/lib/chef_metal_lxc/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalLXC
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-lxc
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Ranjib Dey
 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