commit 9f42b97622a28b3298ec17e5e15f95516c373466
author Zack Williams <zdw@opennetworking.org> Wed Jan 10 15:05:35 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Thu Feb 08 01:05:40 2018 +0000
tree 0de7c7e2e558b6e5c84d88d3d20ea039ac9fd09e
parent 2793cd11070e1ad0ef9d2e17ed2ca8a71dacb27f

[CORD-2608]
Create scenarios suitable for kubespray and helm

Change-Id: I07b19cfc00165046f8fbe6807f2d8add28398cbd

scenarios/preppedpod/Vagrantfile

diff --git a/scenarios/preppedpod/Vagrantfile b/scenarios/preppedpod/Vagrantfile
index 6cfefe0..b74d574 100644
--- a/scenarios/preppedpod/Vagrantfile
+++ b/scenarios/preppedpod/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 #
-# opencloud Vagrantfile
+# preppedpod Vagrantfile
 
 require 'yaml'
 settings = YAML.load_file('genconfig/config.yml')
@@ -17,15 +17,23 @@
       v.memory = settings['head_vm_mem']
       v.cpus = settings['head_vm_cpu']
       v.machine_virtual_size = 100
-      v.management_network_name = settings['vm_public_network_name'] # public network
-      v.management_network_address = settings['vm_public_network_cidr']
     end
     h.vm.network "private_network", # management network, eth1
-      ip: "0.1.1.0", # not used, ignore
+      adapter: 1,
+      ip: "0.1.0.0", # not used, ignore
       auto_config: false,
+      virtualbox__intnet: settings['vm_management_network_name'],
       libvirt__network_name: settings['vm_management_network_name'],
       libvirt__forward_mode: "none",
       libvirt__dhcp_enabled: false
+    h.vm.network "private_network", # public network, eth2
+      adapter: 2,
+      ip: "0.2.0.0", # not used, ignore
+      auto_config: false,
+      virtualbox__intnet: settings['vm_public_network_name'],
+      libvirt__network_name: settings['vm_public_network_name'],
+      libvirt__forward_mode: "none",
+      libvirt__dhcp_enabled: false
   end
 
   config.vm.define "compute1" do |c|
@@ -35,15 +43,23 @@
       v.cpus = settings['compute_vm_cpu']
       v.machine_virtual_size = 50
       v.nested = true
-      v.management_network_name = settings['vm_public_network_name'] # public network
-      v.management_network_address = settings['vm_public_network_cidr']
     end
     c.vm.network "private_network", # management network, eth1
-      ip: "0.1.1.0",
+      adapter: 1,
+      ip: "0.1.0.0",
       auto_config: false,
+      virtualbox__intnet: settings['vm_management_network_name'],
       libvirt__network_name: settings['vm_management_network_name'],
       libvirt__forward_mode: "none",
       libvirt__dhcp_enabled: false
+    c.vm.network "private_network", # public network, eth2
+      adapter: 2,
+      ip: "0.2.0.0", # not used, ignore
+      auto_config: false,
+      virtualbox__intnet: settings['vm_public_network_name'],
+      libvirt__network_name: settings['vm_public_network_name'],
+      libvirt__forward_mode: "none",
+      libvirt__dhcp_enabled: false
   end
 
   config.vm.define "compute2" do |c|
@@ -53,15 +69,23 @@
       v.cpus = settings['compute_vm_cpu']
       v.machine_virtual_size = 50
       v.nested = true
-      v.management_network_name = settings['vm_public_network_name'] # public network
-      v.management_network_address = settings['vm_public_network_cidr']
     end
     c.vm.network "private_network", # management network, eth1
-      ip: "0.1.1.0",
+      adapter: 1,
+      ip: "0.1.0.0",
       auto_config: false,
+      virtualbox__intnet: settings['vm_management_network_name'],
       libvirt__network_name: settings['vm_management_network_name'],
       libvirt__forward_mode: "none",
       libvirt__dhcp_enabled: false
+    c.vm.network "private_network", # public network, eth2
+      adapter: 2,
+      ip: "0.2.0.0", # not used, ignore
+      auto_config: false,
+      virtualbox__intnet: settings['vm_public_network_name'],
+      libvirt__network_name: settings['vm_public_network_name'],
+      libvirt__forward_mode: "none",
+      libvirt__dhcp_enabled: false
   end
 
 end