vagrant-dotvm 0.26.0 → 0.27.0
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a3741c33af778361df094226b8ee04095478677e
|
4
|
+
data.tar.gz: 070ffb7649d83eb279de16ef5da589b7fb89b2a3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e6d9a977df0c577e91d401bbe766f2672cbc67e53f13843f3448422e28ba1560e4c911e056bf1b4ac4766eabf28ca12dd6fb74bab0d88bcd46a5fc53a3b0ca0d
|
7
|
+
data.tar.gz: be493b14ed0e792ec75182a336a587e6fc50cfa3bf8b5cb7eaddcab6af477d70ab30a5dd4faf5c4a36cc1df206fa4346ef6048c66bb0c31006ffdcf5d1bfa742
|
data/CHANGELOG.md
CHANGED
@@ -3,7 +3,7 @@ module VagrantPlugins
|
|
3
3
|
module Config
|
4
4
|
class Machine < AbstractConfig
|
5
5
|
attr_accessor :nick
|
6
|
-
attr_accessor :name
|
6
|
+
attr_accessor :hostname # name
|
7
7
|
attr_accessor :box
|
8
8
|
attr_accessor :memory
|
9
9
|
attr_accessor :cpus
|
@@ -61,6 +61,10 @@ module VagrantPlugins
|
|
61
61
|
)
|
62
62
|
end
|
63
63
|
|
64
|
+
def name=(value)
|
65
|
+
@hostname = value
|
66
|
+
end
|
67
|
+
|
64
68
|
def usable_port_range=(value)
|
65
69
|
m = value.scan(/^(\d+)\.\.(\d+)$/)
|
66
70
|
raise "Invalid usable_port_range, it must be in A..B format." if m.length == 0
|
@@ -5,8 +5,8 @@ module VagrantPlugins
|
|
5
5
|
attr_reader :net
|
6
6
|
attr_accessor :type
|
7
7
|
attr_accessor :ip
|
8
|
-
attr_accessor :
|
9
|
-
attr_accessor :interface
|
8
|
+
attr_accessor :netmask # mask
|
9
|
+
attr_accessor :virtualbox__intnet # interface
|
10
10
|
attr_accessor :guest
|
11
11
|
attr_accessor :host
|
12
12
|
attr_accessor :protocol
|
@@ -33,8 +33,12 @@ module VagrantPlugins
|
|
33
33
|
@net = nets[value]
|
34
34
|
end
|
35
35
|
|
36
|
-
def
|
37
|
-
@
|
36
|
+
def mask=(value)
|
37
|
+
@netmask = value
|
38
|
+
end
|
39
|
+
|
40
|
+
def interface=(value)
|
41
|
+
@virtualbox__intnet = value
|
38
42
|
end
|
39
43
|
end
|
40
44
|
end
|
@@ -58,6 +58,23 @@ module VagrantPlugins
|
|
58
58
|
attr_accessor :orchestrations
|
59
59
|
attr_accessor :colorize
|
60
60
|
attr_accessor :log_level
|
61
|
+
attr_accessor :am_policy_hub
|
62
|
+
attr_accessor :am_policy_hub
|
63
|
+
attr_accessor :extra_agent_args
|
64
|
+
attr_accessor :classes
|
65
|
+
attr_accessor :deb_repo_file
|
66
|
+
attr_accessor :deb_repo_line
|
67
|
+
attr_accessor :files_path
|
68
|
+
attr_accessor :force_bootstrap
|
69
|
+
attr_accessor :install
|
70
|
+
attr_accessor :mode
|
71
|
+
attr_accessor :policy_server_address
|
72
|
+
attr_accessor :repo_gpg_key_url
|
73
|
+
attr_accessor :run_file
|
74
|
+
attr_accessor :upload_path
|
75
|
+
attr_accessor :yum_repo_file
|
76
|
+
attr_accessor :yum_repo_url
|
77
|
+
attr_accessor :package_name
|
61
78
|
end
|
62
79
|
end
|
63
80
|
end
|
@@ -22,24 +22,15 @@ module VagrantPlugins
|
|
22
22
|
define_opts[:autostart] = machine_cfg.autostart unless machine_cfg.autostart.nil?
|
23
23
|
|
24
24
|
vc.vm.define machine_cfg.nick, **define_opts do |machine|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
machine.vm.box_download_client_cert = machine_cfg.box_download_client_cert unless machine_cfg.box_download_client_cert.nil?
|
35
|
-
machine.vm.box_download_ca_cert = machine_cfg.box_download_ca_cert unless machine_cfg.box_download_ca_cert.nil?
|
36
|
-
machine.vm.box_download_ca_path = machine_cfg.box_download_ca_path unless machine_cfg.box_download_ca_path.nil?
|
37
|
-
machine.vm.box_download_insecure = machine_cfg.box_download_insecure unless machine_cfg.box_download_insecure.nil?
|
38
|
-
machine.vm.box_download_location_trusted = machine_cfg.box_download_location_trusted unless machine_cfg.box_download_location_trusted.nil?
|
39
|
-
machine.vm.box_url = machine_cfg.box_url unless machine_cfg.box_url.nil?
|
40
|
-
machine.vm.communicator = machine_cfg.communicator unless machine_cfg.communicator.nil?
|
41
|
-
machine.vm.guest = machine_cfg.guest unless machine_cfg.guest.nil?
|
42
|
-
machine.vm.usable_port_range = machine_cfg.usable_port_range unless machine_cfg.usable_port_range.nil?
|
25
|
+
[
|
26
|
+
:box, :hostname, :boot_timeout, :box_check_update, :box_version, :graceful_halt_timeout, :post_up_message,
|
27
|
+
:box_download_checksum, :box_download_checksum_type, :box_download_client_cert, :box_download_ca_cert,
|
28
|
+
:box_download_ca_path, :box_download_insecure, :box_download_location_trusted, :box_url, :communicator,
|
29
|
+
:guest, :usable_port_range
|
30
|
+
].each do |opt|
|
31
|
+
val = machine_cfg.send(opt)
|
32
|
+
machine.vm.send("#{opt}=", val) unless val.nil?
|
33
|
+
end
|
43
34
|
|
44
35
|
machine.vm.provider "virtualbox" do |vb|
|
45
36
|
vb.customize ["modifyvm", :id, "--memory", machine_cfg.memory] unless machine_cfg.memory.nil?
|
@@ -59,18 +50,14 @@ module VagrantPlugins
|
|
59
50
|
|
60
51
|
machine_cfg.networks.each do |net|
|
61
52
|
hash = {}
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
hash[:guest_ip] = net.guest_ip unless net.guest_ip.nil?
|
71
|
-
hash[:host_ip] = net.host_ip unless net.host_ip.nil?
|
72
|
-
hash[:auto_correct] = net.auto_correct unless net.auto_correct.nil?
|
73
|
-
hash[:auto_config] = net.auto_config unless net.auto_config.nil?
|
53
|
+
|
54
|
+
[
|
55
|
+
:type, :ip, :netmask, :virtualbox__intnet, :guest, :host, :protocol, :bridge,
|
56
|
+
:guest_ip, :host_ip, :auto_correct, :auto_config,
|
57
|
+
].each do |opt|
|
58
|
+
val = net.send(opt)
|
59
|
+
hash[opt] = val unless val.nil?
|
60
|
+
end
|
74
61
|
|
75
62
|
machine.vm.network net.net, **hash
|
76
63
|
end
|
@@ -102,7 +89,10 @@ module VagrantPlugins
|
|
102
89
|
:install_syndic, :install_type, :install_args, :install_command, :always_install, :bootstrap_script,
|
103
90
|
:bootstrap_options, :version, :minion_key, :minion_id, :minion_pub, :grains_config, :masterless,
|
104
91
|
:master_config, :master_key, :master_pub, :seed_master, :run_highstate, :run_overstate,
|
105
|
-
:orchestrations, :colorize, :log_level,
|
92
|
+
:orchestrations, :colorize, :log_level, :am_policy_hub, :extra_agent_args, :classes,
|
93
|
+
:deb_repo_file, :deb_repo_line, :files_path, :force_bootstrap, :install, :mode,
|
94
|
+
:policy_server_address, :repo_gpg_key_url, :run_file, :upload_path, :yum_repo_file,
|
95
|
+
:yum_repo_url, :package_name,
|
106
96
|
].each do |opt|
|
107
97
|
val = provision.send(opt)
|
108
98
|
p.send("#{opt}=", val) unless val.nil?
|
@@ -112,24 +102,15 @@ module VagrantPlugins
|
|
112
102
|
|
113
103
|
machine_cfg.shared_folders.each do |folder|
|
114
104
|
hash = {}
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
hash[:rsync__args] = folder.rsync__args unless folder.rsync__args.nil?
|
125
|
-
hash[:rsync__auto] = folder.rsync__auto unless folder.rsync__auto.nil?
|
126
|
-
hash[:rsync__chown] = folder.rsync__chown unless folder.rsync__chown.nil?
|
127
|
-
hash[:rsync__exclude] = folder.rsync__exclude unless folder.rsync__exclude.nil?
|
128
|
-
hash[:rsync__rsync_path] = folder.rsync__rsync_path unless folder.rsync__rsync_path.nil?
|
129
|
-
hash[:rsync__verbose] = folder.rsync__verbose unless folder.rsync__verbose.nil?
|
130
|
-
hash[:smb_host] = folder.smb_host unless folder.smb_host.nil?
|
131
|
-
hash[:smb_password] = folder.smb_password unless folder.smb_password.nil?
|
132
|
-
hash[:smb_username] = folder.smb_username unless folder.smb_username.nil?
|
105
|
+
|
106
|
+
[
|
107
|
+
:disabled, :create, :type, :group, :mount_options, :owner, :nfs_export, :nfs_udp, :nfs_version,
|
108
|
+
:rsync__args, :rsync__auto, :rsync__chown, :rsync__exclude, :rsync__rsync_path, :rsync__verbose,
|
109
|
+
:smb_host, :smb_password, :smb_username
|
110
|
+
].each do |opt|
|
111
|
+
val = folder.send(opt)
|
112
|
+
hash[opt] = val unless val.nil?
|
113
|
+
end
|
133
114
|
|
134
115
|
machine.vm.synced_folder folder.host, folder.guest, **hash
|
135
116
|
end
|