vagrant-adbinfo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4bac8d96f69854d32666321b38047366c833df6
-  data.tar.gz: 01b69fe6b83fed7c7a33384fb0b20bd501d9fdd1
+  metadata.gz: 588d0db71d2a61c13683f51d90d2c518f5bd2063
+  data.tar.gz: 7860a8b536c595971661f7f5fe1c4c2ee832f1ef
 SHA512:
-  metadata.gz: d3ddf5383fd6a698c5dd2744b5e7d8ea3eec8876e90ca71821a6cebde19d35ffbfad83cd9fdfdfb352aa58f2b8a5a46066cdf2e8166ec0eef2dc27d2c5627397
-  data.tar.gz: 2f2a779c7f4346e2b616ed18856d7c0b82e53c55addeba869c1e32d6210021b6f61d7632cccf1a5a3d88270fcebb8404d443cba4c220f8d68e579a6a675ef3ce
+  metadata.gz: dfd0a2c04047353a07da79861cef9b08df003fc04eb425aab74b86f05043d91a23fb6b90225c01ebb8bb9864d4b3d04a97d75dadb8e1ad3c325d0fd4a3883638
+  data.tar.gz: c5c6ccde72ae89c8308afa077de0218d7cf6ad195a90d8bf3ab31e4ca2dcf7aba488466df5f4e261c9156be7f9e968808b414b3f5dfa6a0920099194f6484902

data/README.md

@@ -31,7 +31,7 @@ The plugin will use the :forwarded_ports capability to find the forwarded port n
 
 Why? By default Virtualbox creates a box that has no inbound network access.  The pattern is to always forward ports, something that a daemon takes care.
 
-## TLS Certificate Location Support, part 2 (Priority 1b - not started)
+## TLS Certificate Location Support, part 2 (Priority 1b - implemented)
 
 The TLS certificate will always land in a known spot, so we need to add that
 
@@ -50,6 +50,8 @@ Why? vagrant-libvirt has two challenges:
 
 - Support inbound network and no port forward for VirtualBox.
 - Support a port forward on libvirt.
+  - note: port collision is not supported in libvirt, yet see:
+    https://github.com/pradels/vagrant-libvirt/issues/321
 
 ## Other Ideas (not started)
 

data/lib/command.rb

@@ -1,6 +1,29 @@
+module OS
+
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.mac?
+    (/darwin/ =~ RUBY_PLATFORM) != nil
+  end
+
+  def OS.unix?
+    !OS.Windows?
+  end
+
+  def OS.linux?
+    OS.unix? and not OS.mac?
+  end
+
+end
+
 module VagrantPlugins
   module DockerInfo
     class Command < Vagrant.plugin(2, :command)
+      # Vagrant box password as defined in the Kickstart for the box <https://github.com/projectatomic/adb-atomic-developer-bundle/blob/master/build_tools/kickstarts/centos-7-kubernetes-vagrant.ks>
+      # On Windows, pscp utility is used to copy the client side certs on the host, this password is used in the pscp command because the ssh keys can not be used. Details: <https://github.com/bexelbie/vagrant-adbinfo/issues/14>
+      @@vagrant_box_password = "vagrant"
       def self.synopsis
         'provides the IP address:port and tls certificate file location for a docker daemon'
       end
@@ -12,28 +35,41 @@ module VagrantPlugins
 
           # First, get the TLS Certificates, if needed
           if !File.directory?(File.expand_path(".docker", secrets_path)) then
-              # Finds the host machine port forwarded from guest sshd
-              hport = machine.provider.capability(:forwarded_ports).key(22)
+            # Find the ssh information
+            hIP = machine.ssh_info[:host]
+            hport = machine.ssh_info[:port]
+            husername = machine.ssh_info[:username]
 
+	          if !OS.windows? then
+              hprivate_key_path = machine.ssh_info[:private_key_path][0]
               # scp over the client side certs from guest to host machine
-              `scp -r -P #{hport} -o LogLevel=FATAL -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{secrets_path}/private_key vagrant@127.0.0.1:/home/vagrant/.docker #{secrets_path}`
+              `scp -r -P #{hport} -o LogLevel=FATAL -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i #{hprivate_key_path} #{husername}@#{hIP}:/home/vagrant/.docker #{secrets_path}`
+              # extending the .docker path to include         
+              secrets_path = File.expand_path(".docker", secrets_path)
+            else
+              `pscp -r -P #{hport} -pw #@@vagrant_box_password -p #{husername}@#{hIP}:/home/vagrant/.docker #{secrets_path}`
+              # extending the .docker path to include         
+              secrets_path = File.expand_path(".docker", secrets_path)
+              secrets_path = secrets_path.split('/').join('\\') + '\\'
+            end
           end
 
-          # Print configuration information for accesing the docker daemon
-
           # Finds the host machine port forwarded from guest docker
            port = machine.provider.capability(:forwarded_ports).key(2376)
-          message =
+	         guest_ip = "127.0.0.1"
+
+           # Print configuration information for accesing the docker daemon
+           message =
                 <<-eos
 Set the following environment variables to enable access to the
 docker daemon running inside of the vagrant virtual machine:
 
-export DOCKER_HOST=tcp://127.0.0.1:#{port}
-export DOCKER_CERT_PATH=#{secrets_path}/.docker
+export DOCKER_HOST=tcp://#{guest_ip}:#{port}
+export DOCKER_CERT_PATH=#{secrets_path}
 export DOCKER_TLS_VERIFY=1
-export DOCKER_MACHINE_NAME=\"#{machine.index_uuid[0..6]}\"
+export DOCKER_MACHINE_NAME=#{machine.index_uuid[0..6]}
                 eos
-          @env.ui.info(message)
+          @env.ui.info(puts(message))
         end
       end
     end

data/vagrant-adbinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'vagrant-adbinfo'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.homepage      = 'https://github.com/bexelbie/vagrant-adbinfo'
   spec.summary       = 'Vagrant plugin that provides the IP address:port and tls certificate file location for a docker daemon'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-adbinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Brian Exelbierd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin that provides the IP address:port and tls certificate file