Vagrantfile in vagrant-pe_build-0.13.0

- old
+ new
@@ -5,90 +5,66 @@
   end
 end
 
 Vagrant.configure('2') do |config|
   config.pe_build.download_root = ENV['PE_BUILD_DOWNLOAD_ROOT']
-  # This is the box name used by the setup helpers in the acceptance tests.
-  config.vm.box = 'box'
-  config.vm.provision :shell, :inline => 'service iptables stop'
 
-  config.vm.define 'pe-201520-master' do |node|
-    node.vm.hostname = 'pe-201520-master.pe-bootstrap.vlan'
+  config.vm.define 'pe-20152-master' do |node|
+    node.vm.hostname = 'pe-20152-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.network 'private_network', :ip => '10.20.1.100'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-201520-agent.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.101 pe-20152-agent.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.0'
+      p.version = '2015.2.1'
       p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
     end
   end
 
-  config.vm.define 'pe-201520-agent' do |node|
-    node.vm.hostname = 'pe-201520-agent.pe-bootstrap.vlan'
+  config.vm.define 'pe-20152-agent' do |node|
+    node.vm.hostname = 'pe-20152-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
 
     node.vm.network 'private_network', :ip => '10.20.1.101'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-201520-master.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.100 pe-20152-master.pe-bootstrap.vlan" >> /etc/hosts'
 
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.0'
-      p.role = :agent
-      p.master = 'pe-201520-master.pe-bootstrap.vlan'
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-20152-master'
     end
   end
 
-  config.vm.define 'pe-201521-master' do |node|
-    node.vm.hostname = 'pe-201521-master.pe-bootstrap.vlan'
-    # All-in-one master nodes need a generous amount of RAM for all the Java.
-    set_resources node, 4096, 1
-
-    node.vm.network 'private_network', :ip => '10.20.1.102'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-201521-agent.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.1'
-      p.role = :master
-    end
-  end
-
-  config.vm.define 'pe-201521-agent' do |node|
-    node.vm.hostname = 'pe-201521-agent.pe-bootstrap.vlan'
-
-    node.vm.network 'private_network', :ip => '10.20.1.103'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-201521-master.pe-bootstrap.vlan" >> /etc/hosts'
-
-    node.vm.provision :pe_bootstrap do |p|
-      p.version = '2015.2.1'
-      p.role = :agent
-      p.master = 'pe-201521-master.pe-bootstrap.vlan'
-    end
-  end
-
   config.vm.define 'pe-2015latest-master' do |node|
     node.vm.hostname = 'pe-2015latest-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.network 'private_network', :ip => '10.20.1.104'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.105 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.network 'private_network', :ip => '10.20.1.102'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.103 pe-2015latest-agent.pe-bootstrap.vlan" >> /etc/hosts'
 
     node.vm.provision :pe_bootstrap do |p|
       p.version_file = 'LATEST'
       p.role = :master
+      # Set autosign to false so that we can test pe_agent functionality.
+      p.autosign = false
     end
   end
 
   config.vm.define 'pe-2015latest-agent' do |node|
     node.vm.hostname = 'pe-2015latest-agent.pe-bootstrap.vlan'
+    node.vm.box      = 'ubuntu'
 
-    node.vm.network 'private_network', :ip => '10.20.1.105'
-    node.vm.provision :shell, :inline => 'echo "10.20.1.104 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
+    node.vm.network 'private_network', :ip => '10.20.1.103'
+    node.vm.provision :shell, :inline => 'echo "10.20.1.102 pe-2015latest-master.pe-bootstrap.vlan" >> /etc/hosts'
 
-    node.vm.provision :pe_bootstrap do |p|
-      p.version_file = 'LATEST'
-      p.role = :agent
-      p.master = 'pe-2015latest-master.pe-bootstrap.vlan'
+    node.vm.provision :pe_agent do |p|
+      p.master_vm = 'pe-2015latest-master'
     end
   end
 end