vagrant-rancher 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3c2dc3161c776541a2b441b9a39b9705022c937c
4
- data.tar.gz: a952d49845fc87aa9180f200d514eaae0f2d6c59
3
+ metadata.gz: b30a96a8ef67ec1db3ef760c08a31067003fcc40
4
+ data.tar.gz: c8908c3c4b4d71c7fad5f08c5d41ffa10c5c79a6
5
5
  SHA512:
6
- metadata.gz: a65ec76efee01e3e60efa51add7be61b4887eeb050900453d2f6f6174db782868b79b9712ba7a4033eb6d3c860eef62147c7ab86e4e5ed14bc98088c94cab704
7
- data.tar.gz: e16a7639b721647d940df9dc356f37d70261e4d050fe58e0dd95c4a4730ae9f6e39a48737aca313dd7ebbee94414bcacc5b13a49742b5d39ca0df6e5e0b382f5
6
+ metadata.gz: 298c452b0d675a6df4e85fe465ca5f4d337f2d1da0f17f88524e583afda57000b07ad525c1cdde0e1118a250f362be7eb91a467c07da524d7d0a0bd731dc1284
7
+ data.tar.gz: e82624a4d16a0e9ccfcb355be32deb925afc4aaa18d88f43c8a46199ddd2f2a5e4e7fe72145431c009637d59ae9c231fe3a6bfcbbb0d2a55fe526001084a0366
@@ -8,6 +8,7 @@ module VagrantPlugins
8
8
  attr_accessor :deactivate
9
9
  attr_accessor :rancher_server_image
10
10
  attr_accessor :server_args
11
+ attr_accessor :install_agent
11
12
  attr_accessor :labels
12
13
  attr_accessor :project
13
14
  attr_accessor :project_type
@@ -19,6 +20,7 @@ module VagrantPlugins
19
20
  @port = UNSET_VALUE
20
21
  @rancher_server_image = UNSET_VALUE
21
22
  @server_args = UNSET_VALUE
23
+ @install_agent = UNSET_VALUE
22
24
  @labels = UNSET_VALUE
23
25
  @deactivate = UNSET_VALUE
24
26
  @project = UNSET_VALUE
@@ -32,6 +34,7 @@ module VagrantPlugins
32
34
  @port = 8080 if @port == UNSET_VALUE
33
35
  @rancher_server_image = 'rancher/server' if @rancher_server_image == UNSET_VALUE
34
36
  @server_args = nil if @server_args == UNSET_VALUE
37
+ @install_agent = true if @install_agent == UNSET_VALUE
35
38
  @labels = nil if @labels == UNSET_VALUE
36
39
  @deactivate = false if @deactivate == UNSET_VALUE
37
40
  @project = 'Default' if @project == UNSET_VALUE
@@ -56,15 +59,19 @@ module VagrantPlugins
56
59
  unless port.is_a?(Fixnum) || port.is_a?(Fixnum)
57
60
  errors << ':rancher provisioner requires port to be a number'
58
61
  end
59
-
62
+
60
63
  unless rancher_server_image.is_a?(String) || rancher_server_image.nil?
61
64
  errors << ':rancher provisioner requires rancher_server_image to be a string'
62
65
  end
63
-
66
+
64
67
  unless server_args.is_a?(String) || server_args.nil?
65
68
  errors << ':rancher provisioner requires server_args to be a string'
66
69
  end
67
70
 
71
+ unless install_agent.is_a?(TrueClass) || install_agent.is_a?(FalseClass)
72
+ errors << ':rancher provisioner requires install_agent to be a bool'
73
+ end
74
+
68
75
  unless labels.is_a?(Array) || labels.nil?
69
76
  errors << ':rancher provisioner requires labels to be an array'
70
77
  end
@@ -15,8 +15,11 @@ module VagrantPlugins
15
15
  self.install_server if config.role == 'server'
16
16
 
17
17
  self.configure_server
18
- self.install_agent
19
- self.configure_agent
18
+
19
+ if config.install_agent
20
+ self.install_agent
21
+ self.configure_agent
22
+ end
20
23
  end
21
24
 
22
25
  # determines if we can reach the docker daemon
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Rancher
3
- VERSION = '1.1.2'
3
+ VERSION = '1.1.3'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-rancher
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - nextrevision
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-05-17 00:00:00.000000000 Z
11
+ date: 2016-05-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler