[CORD-1478]
Configure networking in virtual scenarios in virtual-specific podconfigs
Change-Id: Iea0667192e5d2a3aa2a469abfdb1b38970247495
diff --git a/podconfig/rcord-controlkube.yml b/podconfig/rcord-controlkube.yml
index b96ee4a..fff6600 100644
--- a/podconfig/rcord-controlkube.yml
+++ b/podconfig/rcord-controlkube.yml
@@ -31,3 +31,16 @@
docker_registry_ext_port: "5000"
deploy_docker_registry: "docker-registry.{{ site_suffix }}:{{ docker_registry_ext_port }}"
+# Virtual-specific config of network interfaces, for virtual install in Vagrant
+#
+# which network interfaces belong to which bond on nodes
+management_net_interfaces:
+ - eth1
+
+fabric_net_interfaces:
+ - eth2
+
+# Bring up alias interfaces for the vsg and public networks, for forwarding
+# traffic in virtual pod
+use_addresspool_vsg: True
+use_addresspool_public: True
diff --git a/podconfig/rcord-preppedkube.yml b/podconfig/rcord-preppedkube.yml
index f7804c3..2228ed0 100644
--- a/podconfig/rcord-preppedkube.yml
+++ b/podconfig/rcord-preppedkube.yml
@@ -31,3 +31,16 @@
docker_registry_ext_port: "5000"
deploy_docker_registry: "docker-registry.{{ site_suffix }}:{{ docker_registry_ext_port }}"
+# Virtual-specific config of network interfaces, for virtual install in Vagrant
+#
+# which network interfaces belong to which bond on nodes
+management_net_interfaces:
+ - eth1
+
+fabric_net_interfaces:
+ - eth2
+
+# Bring up alias interfaces for the vsg and public networks, for forwarding
+# traffic in virtual pod
+use_addresspool_vsg: True
+use_addresspool_public: True
diff --git a/podconfig/rcord-preppedpod.yml b/podconfig/rcord-preppedpod.yml
index db975c8..397214a 100644
--- a/podconfig/rcord-preppedpod.yml
+++ b/podconfig/rcord-preppedpod.yml
@@ -14,8 +14,23 @@
# limitations under the License.
# rcord-preppedpod POD Config
-# Creates a multi-node POD on pre-prepared systems (OS installed) with R-CORD services
+#
+# Creates a multi-node POD on pre-prepared systems (OS installed) with R-CORD
+# services
cord_scenario: preppedpod
cord_profile: rcord
+# Virtual-specific config of network interfaces, for virtual install in Vagrant
+#
+# which network interfaces belong to which bond on nodes
+management_net_interfaces:
+ - eth1
+
+fabric_net_interfaces:
+ - eth2
+
+# Bring up alias interfaces for the vsg and public networks, for forwarding
+# traffic in virtual pod
+use_addresspool_vsg: True
+use_addresspool_public: True
diff --git a/podconfig/rcord-virtual.yml b/podconfig/rcord-virtual.yml
index bf826f0..926c266 100644
--- a/podconfig/rcord-virtual.yml
+++ b/podconfig/rcord-virtual.yml
@@ -1,4 +1,4 @@
-
+---
# Copyright 2017-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
----
# rcord-virtual Pod Config
# Creates a virtual multi-node R-CORD pod, aka "rcord-in-a-box"
@@ -26,8 +24,24 @@
- ciab-ovs
build_targets:
- - compute1-up
+ - compute1-up
+# Virtual-specific config of network interfaces, for virtual install in Vagrant
+#
+# platform-install config variables
+# which network interfaces belong to which bond on nodes
+management_net_interfaces:
+ - eth2
+
+fabric_net_interfaces:
+ - eth3
+
+# Bring up alias interfaces for the vsg and public networks, for forwarding
+# traffic in virtual pod
+use_addresspool_vsg: True
+use_addresspool_public: True
+
+# MaaS config variables
external_iface: 'eth0'
skipTags:
@@ -37,9 +51,9 @@
- 'interface_config'
# Other old config carried over
-cord_in_a_box: True # what is this for?
+cord_in_a_box: True # what is this for?
fabric_include_names: eth2
fabric_include_module_types: omit
fabric_exclude_names: eth0,eth1
management_include_names: eth1
-management_exclude_names: eth0,eth2
\ No newline at end of file
+management_exclude_names: eth0,eth2