16 files changed, 33 insertions, 15 deletions
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 6e85fa20..286b5162 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index cfdc5dd3..2d1b44ad 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
index 739b3e3d..11b093f0 100644
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk
diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
index 9cb783d3..3082dcb4 100644
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs-noha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   dataplane: ovs_dpdk
diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index c975e24d..acbc1d34 100644
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -5,7 +5,7 @@ deploy_options:
   sdn_controller: false
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vsperf: false
diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index 710a0be9..4ad1ee2b 100644
--- a/config/deploy/os-ocl-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opencontrail
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
index 73507772..1d29c2bf 100644
--- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-bgpvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: false
-  congress: false
+  congress: true
   sfc: false
   vpn: true
diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index c7a9d8e0..c66b35b6 100644
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true
diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
index ca090154..15942fd6 100644
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@ -6,7 +6,7 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
   vpp: true
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index e614fd49..4c88eeb3 100644
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: beryllium
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
index ca35a0fe..f6904f05 100644
--- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml
+++ b/config/deploy/os-odl_l2-sdnvpn-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: false
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: true
diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
index e8f3f986..fa9a7868 100644
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ b/config/deploy/os-odl_l2-sfc-noha.yaml
@@ -6,6 +6,6 @@ deploy_options:
   sdn_l3: false
   odl_version: boron
   tacker: true
-  congress: false
+  congress: true
   sfc: true
   vpn: false
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index 47650459..e54f28b0 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: opendaylight
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 1de52298..0d083dda 100644
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: false
   vpn: false
diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml
index e0c8d9e8..f0b78511 100644
--- a/config/deploy/os-onos-sfc-ha.yaml
+++ b/config/deploy/os-onos-sfc-ha.yaml
@@ -5,6 +5,6 @@ deploy_options:
   sdn_controller: onos
   sdn_l3: true
   tacker: true
-  congress: false
+  congress: true
   sfc: true
   vpn: false
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index 8ca5eaca..dd2d066e 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -30,12 +30,15 @@ dns_servers: ["8.8.8.8", "8.8.4.4"]
 # network is used as the OpenStack management network which
 # carries e.g. communication between its internal components.
 # This network must be IPv4 currently.
+domain_name: 'opnfvapex.com'
 
 admin_network:
   enabled: true
   network_type: bridged
   bridged_interface: ''
   bond_interfaces: ''
+  compute_interface: nic1
+  controller_interface: nic1
   vlan: native
   usable_ip_range: 192.0.2.11,192.0.2.99
   gateway: 192.0.2.1
@@ -53,6 +56,11 @@ admin_network:
 private_network:
   enabled: true
   cidr: 11.0.0.0/24
+  vlan: native
+  cidr: 11.0.0.0/24
+  compute_interface: nic2
+  controller_interface: nic2
+
 
 # "public" network is used for external connectivity.
 # The external network provides Internet access for virtual
@@ -65,6 +73,9 @@ public_network:
   enabled: true
   network_type: ''
   bridged_interface: ''
+  compute_interface: nic3
+  controller_interface: nic3
+  vlan: native
   cidr: 2001:db8::/64
   gateway: 2001:db8::1
   provisioner_ip: 2001:db8::1
@@ -76,11 +87,18 @@ public_network:
 storage_network:
   enabled: true
   cidr: fd00:fd00:fd00:2000::/64
+  vlan: native
+  compute_interface: nic4
+  controller_interface: nic4
+
 
 # "api" is an optional network used by internal openstack api services.
 api_network:
   enabled: true
   cidr: fd00:fd00:fd00:4000::/64
+  vlan: native
+  compute_interface: nic5
+  controller_interface: nic5
 
 #public_network:
 #  enabled: true                                     #If disabled, public_network traffic will collapse to admin network