acceptance/skeletons/2015x_acceptance/Vagrantfile in vagrant-pe_build-0.17.12 vs acceptance/skeletons/2015x_acceptance/Vagrantfile in vagrant-pe_build-0.17.13
- old
+ new
@@ -1,7 +1,8 @@
-# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 and 2015.3 shared
-# the same installation workflow.
+# NOTE: This acceptance suite actually uses 2016.1 as 2015.2 -- 2016.1 shared
+# the same installation workflow. 2016.1.2 was the penultimate release for
+# that workflow.
def set_resources box, max_ram=512, max_cpu=1
box.vm.provider :virtualbox do |vb|
vb.customize ["modifyvm", :id, "--cpus", max_cpu]
vb.customize ["modifyvm", :id, "--memory", max_ram]
end
@@ -14,10 +15,10 @@
config.vm.define 'pe-20161-master' do |node|
node.vm.hostname = 'pe-20161-master.pe-bootstrap.vlan'
node.vm.box = 'centos'
# All-in-one master nodes need a generous amount of RAM for all the Java.
set_resources node, 4096, 1
- node.vm.provision :shell, :inline => 'service iptables stop'
+ node.vm.provision :shell, :inline => "service iptables stop || true\niptables -F || true"
node.vm.network 'private_network', :ip => '10.20.1.100'
node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20161-agent.pe-bootstrap.vlan" >> /etc/hosts'
node.vm.provision :pe_bootstrap do |p|