[CORD-2608]
Create scenarios suitable for kubespray and helm
Change-Id: I07b19cfc00165046f8fbe6807f2d8add28398cbd
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
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index 5ccc1d4..2c38e31 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -71,9 +71,9 @@
aliases:
- head
- name: compute1
- ipv4_last_octet: 250
+ ipv4_last_octet: 17
- name: compute2
- ipv4_last_octet: 251
+ ipv4_last_octet: 18
# Vagrant VM configuration
vagrant_vms:
@@ -95,6 +95,30 @@
vm_public_network_name: cordpub
vm_public_network_cidr: "10.230.100.0/24"
+# which network interfaces belong to which bond on nodes
+management_net_interfaces:
+ - eth1
+
+fabric_net_interfaces:
+ - eth2
+
+# veth pair connected between a linux and integration bridge are described here
+# https://wiki.opencord.org/display/CORD/VTN+Manual+Tests#VTNManualTests-Testenvironmentsetup
+# but may not work?
+# vtn_integration_bridge_interface: vethfabric1
+
+vtn_integration_bridge_interface: fabricbond
+
+headnode_fabric_bridge: fabricbridge
+
+use_vtn_net_management_host: False
+
+vtn_net_management_host_interface: vethmgmt1
+
+use_addresspool_vsg: True
+use_addresspool_public: True
+
+
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"