vagrant-rancher 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc5f9f9ce9ca77cca5003504ebf18990b5a889c
-  data.tar.gz: 2237ae2b0cd21006ac30159ab52feff0e275dbea
+  metadata.gz: 8df01d7347f365d50d14833847a6a5103220cd93
+  data.tar.gz: 9495ee02ae5dcce82bf6a3bda1436790e4539195
 SHA512:
-  metadata.gz: 0bec5ec68204cfaf5ef8e2c50138fe6685d1130e8fcfa4a37f3a712d03d806778cae184ad0a3123f86dbf678790ead9b63deb0ee95a6817d608154c9c66351fd
-  data.tar.gz: e3c094d730166f34309f395cb1d39ebb5f567e21750f452defede44be10f6aed292274c07b6bce2b947ac00f5e3a5e9ece91edb4f850ef6f325a167da99216d9
+  metadata.gz: 7989517da08c24d0016e9b075ae3a100d436a0922ef70a27b1381db2a1ab9a1a4b1cbb17647b195381400de76414db13f8941141097aaea9b00d59385c67d69a
+  data.tar.gz: 8a4c7c15b785bab4ebe4cbdda16319648009568c84a6e5086d019426378f8a94952bf1f507183c3026028f4cfc5b802c3b4c50b99677b16279071a0ff4df80ee

data/README.md

@@ -38,6 +38,7 @@ The `vagrant-rancher` plugin requires the hostname being set to either a DNS nam
 * `role` (*optional*, default: `'server'`): either 'server' (to run the Rancher server) or 'agent' to only run the Rancher agent
 * `version` (*optional*, default: `'latest'`): version (tag) of the Rancher server container to run
 * `port` (*optional*, default: `8080`): port to run the rancher server on in the case of the server, and communicate with in the case of the agent
+* `rancher_server_image` (*optional*, default: `rancher/server`): Override default Rancher server image name. Allows for pull from a private registry
 * `server_args` (*optional*, default: `''`): additional args to pass to the Docker run command when starting the Rancher server
 * `labels` (*optional*, default: `[]`): array of key=value pairs of labels to assign to the agent (ex. ["role=server","env=local"])
 * `deactivate` (*optional*, default: `false`): deactivate the host in Rancher to prevent it from being scheduled on

data/lib/vagrant-rancher/config.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
       attr_accessor :hostname
       attr_accessor :port
       attr_accessor :deactivate
+      attr_accessor :rancher_server_image
       attr_accessor :server_args
       attr_accessor :labels
       attr_accessor :project
@@ -16,6 +17,7 @@ module VagrantPlugins
         @version = UNSET_VALUE
         @hostname = UNSET_VALUE
         @port = UNSET_VALUE
+        @rancher_server_image = UNSET_VALUE
         @server_args = UNSET_VALUE
         @labels = UNSET_VALUE
         @deactivate = UNSET_VALUE
@@ -28,6 +30,7 @@ module VagrantPlugins
         @version = 'latest' if @version == UNSET_VALUE
         @hostname = nil if @hostname == UNSET_VALUE
         @port = 8080 if @port == UNSET_VALUE
+        @rancher_server_image = 'rancher/server' if @rancher_server_image == UNSET_VALUE
         @server_args = nil if @server_args == UNSET_VALUE
         @labels = nil if @labels == UNSET_VALUE
         @deactivate = false if @deactivate == UNSET_VALUE
@@ -53,7 +56,11 @@ module VagrantPlugins
         unless port.is_a?(Fixnum) || port.is_a?(Fixnum)
           errors << ':rancher provisioner requires port to be a number'
         end
-
+        
+        unless rancher_server_image.is_a?(String) || rancher_server_image.nil?
+          errors << ':rancher provisioner requires rancher_server_image to be a string'
+        end
+        
         unless server_args.is_a?(String) || server_args.nil?
           errors << ':rancher provisioner requires server_args to be a string'
         end

data/lib/vagrant-rancher/provisioner.rb

@@ -31,7 +31,7 @@ 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: rancher/server:#{config.version}..."
+          @machine.ui.info "Starting server container: #{config.rancher_server_image}:#{config.version}..."
 
           docker_cmd = "docker run -d -t --name rancher-server -p #{@config.port}:8080"
 
@@ -41,7 +41,7 @@ module VagrantPlugins
           end
 
           # start the server and error if there is a failure
-          unless @machine.communicate.sudo("#{docker_cmd} rancher/server:#{config.version}")
+          unless @machine.communicate.sudo("#{docker_cmd} #{config.rancher_server_image}:#{config.version}")
             @machine.ui.error 'Could not start Rancher server container'
             raise Errors::RancherServerContainer
           end

data/lib/vagrant-rancher/version.rb

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

metadata

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