vagrant-em-demos 0.1.3 → 0.1.4
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
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d93441ea0a868529a8c1a23ca4a1e707eae1b6f9b5e876444a0c3fc307f5b5a6
|
|
4
|
+
data.tar.gz: fd57329ddbdd16ac09af4ddc27c9490527861372f2180d2f6ea2d414dbe07b26
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f444b085abd617f086ff33f7cf07f08922150d33e2738464f9205c7762ec485681a0f5ef59eb1ed655586b352868b00c52a41acb4b8125c6eb296237032109d1
|
|
7
|
+
data.tar.gz: dc56f114fbccfba673747ebb869fd356683f3d6a35615142954d68f643e4d78b99a95a766cde4d9c4655f2154d834bab7ce365e2f9dc263725504732d6f53f65
|
|
@@ -33,7 +33,7 @@ module Vagrant
|
|
|
33
33
|
:protocol, :disks, :additional_hosts, :custom_facts,
|
|
34
34
|
:required_plugins, :software_files, :needs_storage,
|
|
35
35
|
:virtualboxorafix, :dhcp_fix, :cluster, :run_r10k, :mount_uid,
|
|
36
|
-
:mount_gid, :prefix, :ip_start_address, :ipaddress
|
|
36
|
+
:mount_gid, :prefix, :ip_start_address, :ipaddress, :own_dns
|
|
37
37
|
]
|
|
38
38
|
attr_reader(*ATTRIBUTES)
|
|
39
39
|
attr_accessor :generated_ip, :index, :vmname
|
|
@@ -51,13 +51,13 @@ module Vagrant
|
|
|
51
51
|
end
|
|
52
52
|
@name = name
|
|
53
53
|
@index = index
|
|
54
|
-
if
|
|
54
|
+
if public_ip
|
|
55
|
+
@ipaddress = @public_ip
|
|
56
|
+
else
|
|
57
|
+
fail "public_ip or ip_start_address is required for #{name}" unless ip_start_address
|
|
55
58
|
adress_manager = VagrantPlugins::AdressManager.instance(ip_start_address)
|
|
56
59
|
@generated_ip = adress_manager.register_node(fqdn)
|
|
57
60
|
@ipaddress = @generated_ip
|
|
58
|
-
else
|
|
59
|
-
fail "priate_ip or ip_start_address is required"
|
|
60
|
-
@ipaddress = @private_ip
|
|
61
61
|
end
|
|
62
62
|
|
|
63
63
|
initialize_disks(attributes["disks"])
|
|
@@ -134,6 +134,17 @@ module Vagrant
|
|
|
134
134
|
end
|
|
135
135
|
end
|
|
136
136
|
|
|
137
|
+
# Fix setup for Oracle applications
|
|
138
|
+
def virtualboxorafix(vb)
|
|
139
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/Leaf', '0x4']
|
|
140
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/SubLeaf', '0x4']
|
|
141
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/eax', '0']
|
|
142
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/ebx', '0']
|
|
143
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/ecx', '0']
|
|
144
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/edx', '0']
|
|
145
|
+
vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/SubLeafMask', '0xffffffff']
|
|
146
|
+
end
|
|
147
|
+
|
|
137
148
|
# Configure VirtualBox disks attached to the virtual machine
|
|
138
149
|
def configure_disks(vb, model)
|
|
139
150
|
vminfo = vm_info(model.name)
|
|
@@ -298,10 +309,15 @@ module Vagrant
|
|
|
298
309
|
vb.cpus = model.cpucount || 1
|
|
299
310
|
vb.memory = model.ram || 4096
|
|
300
311
|
vb.name = model.vmname
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
312
|
+
if model.own_dns
|
|
313
|
+
vb.auto_nat_dns_proxy = false
|
|
314
|
+
vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
|
|
315
|
+
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
|
|
316
|
+
else
|
|
317
|
+
vb.auto_nat_dns_proxy = true
|
|
318
|
+
vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
|
|
319
|
+
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
|
|
320
|
+
end
|
|
305
321
|
virtualboxorafix(vb) if model.virtualboxorafix
|
|
306
322
|
|
|
307
323
|
configure_disks(vb, model) if model.needs_storage
|