vagrant-dotvm 0.22.0 → 0.23.0
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 +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/vagrant-dotvm/config/machine.rb +7 -0
- data/lib/vagrant-dotvm/config/provision.rb +4 -0
- data/lib/vagrant-dotvm/configinjecter.rb +28 -23
- data/lib/vagrant-dotvm/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fa4c89cee3717b8f9a5606b93048a8bc2644aac0
|
|
4
|
+
data.tar.gz: c8c26855468ab2635900cabc2a71bfe9bd54b975
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f10ba5f65aabb34f5a875e756cc9ce04e4d7f0a17f1bd5e691e2664066facc8e9023a4f18b21b89335246e3462c3eddbd3cd93e9692228a34fb900d952c6afbc
|
|
7
|
+
data.tar.gz: 701a802918d8c8ad1dc866b0e73fad4bd94a0cd847f1d3ee84c9cf842cc9822bcbd9e7ec914efe76b71b0742184c490ffc1a2b6ca187af0bda7fe076160627ca
|
data/CHANGELOG.md
CHANGED
|
@@ -34,6 +34,7 @@ module VagrantPlugins
|
|
|
34
34
|
attr_accessor :box_url
|
|
35
35
|
attr_accessor :communicator
|
|
36
36
|
attr_accessor :guest
|
|
37
|
+
attr_reader :usable_port_range
|
|
37
38
|
|
|
38
39
|
def initialize()
|
|
39
40
|
@primary = false
|
|
@@ -61,6 +62,12 @@ module VagrantPlugins
|
|
|
61
62
|
)
|
|
62
63
|
end
|
|
63
64
|
|
|
65
|
+
def usable_port_range=(value)
|
|
66
|
+
m = value.scan(/^(\d+)\.\.(\d+)$/)
|
|
67
|
+
raise "Invalid usable_port_range, it must be in A..B format." if m.length == 0
|
|
68
|
+
@usable_port_range = Range.new(m[0][0].to_i, m[0][1].to_i)
|
|
69
|
+
end
|
|
70
|
+
|
|
64
71
|
def populate_networks(data)
|
|
65
72
|
data.to_a.each do |conf|
|
|
66
73
|
item = Network.new
|
|
@@ -28,6 +28,10 @@ module VagrantPlugins
|
|
|
28
28
|
attr_accessor :synced_folder_args
|
|
29
29
|
attr_accessor :temp_dir
|
|
30
30
|
attr_accessor :working_directory
|
|
31
|
+
attr_accessor :client_cert_path
|
|
32
|
+
attr_accessor :client_private_key_path
|
|
33
|
+
attr_accessor :puppet_node
|
|
34
|
+
attr_accessor :puppet_server
|
|
31
35
|
end
|
|
32
36
|
end
|
|
33
37
|
end
|
|
@@ -28,6 +28,7 @@ module VagrantPlugins
|
|
|
28
28
|
machine.vm.box_url = machine_cfg.box_url unless machine_cfg.box_url.nil?
|
|
29
29
|
machine.vm.communicator = machine_cfg.communicator unless machine_cfg.communicator.nil?
|
|
30
30
|
machine.vm.guest = machine_cfg.guest unless machine_cfg.guest.nil?
|
|
31
|
+
machine.vm.usable_port_range = machine_cfg.usable_port_range unless machine_cfg.usable_port_range.nil?
|
|
31
32
|
|
|
32
33
|
machine.vm.provider "virtualbox" do |vb|
|
|
33
34
|
vb.customize ["modifyvm", :id, "--memory", machine_cfg.memory] unless machine_cfg.memory.nil?
|
|
@@ -76,29 +77,33 @@ module VagrantPlugins
|
|
|
76
77
|
|
|
77
78
|
machine_cfg.provision.each do |provision|
|
|
78
79
|
machine.vm.provision provision.type, run: provision.run do |p|
|
|
79
|
-
p.path
|
|
80
|
-
p.inline
|
|
81
|
-
p.args
|
|
82
|
-
p.privileged
|
|
83
|
-
p.source
|
|
84
|
-
p.destination
|
|
85
|
-
p.module_path
|
|
86
|
-
p.manifest_file
|
|
87
|
-
p.manifests_path
|
|
88
|
-
p.binary_path
|
|
89
|
-
p.hiera_config_path
|
|
90
|
-
p.environment
|
|
91
|
-
p.environment_path
|
|
92
|
-
p.binary
|
|
93
|
-
p.upload_path
|
|
94
|
-
p.keep_color
|
|
95
|
-
p.name
|
|
96
|
-
p.powershell_args
|
|
97
|
-
p.facter
|
|
98
|
-
p.options
|
|
99
|
-
p.synced_folder_type
|
|
100
|
-
p.temp_dir
|
|
101
|
-
p.working_directory
|
|
80
|
+
p.path = provision.path unless provision.path.nil?
|
|
81
|
+
p.inline = provision.inline unless provision.inline.nil?
|
|
82
|
+
p.args = provision.args unless provision.args.nil?
|
|
83
|
+
p.privileged = provision.privileged unless provision.privileged.nil?
|
|
84
|
+
p.source = provision.source unless provision.source.nil?
|
|
85
|
+
p.destination = provision.destination unless provision.destination.nil?
|
|
86
|
+
p.module_path = provision.module_path unless provision.module_path.nil?
|
|
87
|
+
p.manifest_file = provision.manifest_file unless provision.manifest_file.nil?
|
|
88
|
+
p.manifests_path = provision.manifests_path unless provision.manifests_path.nil?
|
|
89
|
+
p.binary_path = provision.binary_path unless provision.binary_path.nil?
|
|
90
|
+
p.hiera_config_path = provision.hiera_config_path unless provision.hiera_config_path.nil?
|
|
91
|
+
p.environment = provision.environment unless provision.environment.nil?
|
|
92
|
+
p.environment_path = provision.environment_path unless provision.environment_path.nil?
|
|
93
|
+
p.binary = provision.binary unless provision.binary.nil?
|
|
94
|
+
p.upload_path = provision.upload_path unless provision.upload_path.nil?
|
|
95
|
+
p.keep_color = provision.keep_color unless provision.keep_color.nil?
|
|
96
|
+
p.name = provision.name unless provision.name.nil?
|
|
97
|
+
p.powershell_args = provision.powershell_args unless provision.powershell_args.nil?
|
|
98
|
+
p.facter = provision.facter unless provision.facter.nil?
|
|
99
|
+
p.options = provision.options unless provision.options.nil?
|
|
100
|
+
p.synced_folder_type = provision.synced_folder_type unless provision.synced_folder_type.nil?
|
|
101
|
+
p.temp_dir = provision.temp_dir unless provision.temp_dir.nil?
|
|
102
|
+
p.working_directory = provision.working_directory unless provision.working_directory.nil?
|
|
103
|
+
p.client_cert_path = provision.client_cert_path unless provision.client_cert_path.nil?
|
|
104
|
+
p.client_private_key_path = provision.client_private_key_path unless provision.client_private_key_path.nil?
|
|
105
|
+
p.puppet_node = provision.puppet_node unless provision.puppet_node.nil?
|
|
106
|
+
p.puppet_server = provision.puppet_server unless provision.puppet_server.nil?
|
|
102
107
|
end
|
|
103
108
|
end
|
|
104
109
|
|