vagrant-rancher 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df01d7347f365d50d14833847a6a5103220cd93
-  data.tar.gz: 9495ee02ae5dcce82bf6a3bda1436790e4539195
+  metadata.gz: 3c2dc3161c776541a2b441b9a39b9705022c937c
+  data.tar.gz: a952d49845fc87aa9180f200d514eaae0f2d6c59
 SHA512:
-  metadata.gz: 7989517da08c24d0016e9b075ae3a100d436a0922ef70a27b1381db2a1ab9a1a4b1cbb17647b195381400de76414db13f8941141097aaea9b00d59385c67d69a
-  data.tar.gz: 8a4c7c15b785bab4ebe4cbdda16319648009568c84a6e5086d019426378f8a94952bf1f507183c3026028f4cfc5b802c3b4c50b99677b16279071a0ff4df80ee
+  metadata.gz: a65ec76efee01e3e60efa51add7be61b4887eeb050900453d2f6f6174db782868b79b9712ba7a4033eb6d3c860eef62147c7ab86e4e5ed14bc98088c94cab704
+  data.tar.gz: e16a7639b721647d940df9dc356f37d70261e4d050fe58e0dd95c4a4730ae9f6e39a48737aca313dd7ebbee94414bcacc5b13a49742b5d39ca0df6e5e0b382f5

data/lib/vagrant-rancher/provisioner.rb

@@ -31,7 +31,19 @@ module VagrantPlugins
       def install_server
         # check to see if the rancher server is already running
         unless @machine.communicate.test('sudo docker inspect rancher-server')
-          @machine.ui.info "Starting server container: #{config.rancher_server_image}:#{config.version}..."
+          image = "#{config.rancher_server_image}:#{config.version}"
+
+          # pull rancher server image if its not already there
+          image_check_cmd = "sudo docker images | awk '{ print $1\":\"$2 }' | grep -q #{image}"
+          unless @machine.communicate.test(image_check_cmd)
+            @machine.ui.info "Pulling Rancher server image: #{image}..."
+            unless @machine.communicate.sudo("docker pull #{image}")
+              @machine.ui.error "Could not pull Rancher server image"
+              raise Errors::RancherServerContainer
+            end
+          end
+
+          @machine.ui.info "Starting server container: #{image}..."
 
           docker_cmd = "docker run -d -t --name rancher-server -p #{@config.port}:8080"
 
@@ -41,7 +53,7 @@ module VagrantPlugins
           end
 
           # start the server and error if there is a failure
-          unless @machine.communicate.sudo("#{docker_cmd} #{config.rancher_server_image}:#{config.version}")
+          unless @machine.communicate.sudo("#{docker_cmd} #{image}")
             @machine.ui.error 'Could not start Rancher server container'
             raise Errors::RancherServerContainer
           end
@@ -88,6 +100,7 @@ module VagrantPlugins
         if project_id.nil?
           @machine.ui.detail "Project does not exist, creating now..."
           @rancher.create_project @config.project, @config.project_type
+          sleep 2
           project_id = @rancher.get_project_id @config.project
           raise Errors::ProjectNotFound if project_id.nil?
         end
@@ -136,6 +149,16 @@ module VagrantPlugins
           extra_args = "-e 'CATTLE_HOST_LABELS=#{labels}' --name rancher-agent-bootstrap"
           docker_cmd = docker_cmd.sub('docker run', "docker run #{extra_args}")
 
+          # pull rancher agent image if its not already there
+          image_check_cmd = "sudo docker images | awk '{ print $1\":\"$2 }' | grep -q #{registration_token['image']}"
+          unless @machine.communicate.test(image_check_cmd)
+            @machine.ui.info "Pulling Rancher agent image: #{registration_token['image']}..."
+            unless @machine.communicate.sudo("docker pull #{registration_token['image']}")
+              @machine.ui.error "Could not pull Rancher agent image"
+              raise Errors::RancherServerContainer
+            end
+          end
+
           # start the agent container
           @machine.ui.info "Starting agent container: #{registration_token['image']}..."
           unless @machine.communicate.sudo(docker_cmd)

data/lib/vagrant-rancher/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rancher
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rancher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - nextrevision
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler