Fix mcp11-ovs-dpdk and mcp11-ovs-dvr virtual labs
- [dpdk] Remove tenant interface usage from compute
Do not use the same interface as 'eth' and 'dpdk'
- [SL] Use stacklight/init.yml for client.yml to get
global parameters, for labs:
sl_os_contrail
mcp11-ovs-dvr
virtual-mcp11-contrail
Change-Id: I2264e8fc4031ceb16c4f75a25dcb2d7286461d61
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
index db35cb0..53b6fb8 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
@@ -14,7 +14,7 @@
parameters:
_param:
primary_interface: ens4
- tenant_interface: ens5
+ #tenant_interface: ens5
external_interface: ens6
interface_mtu: 9000
linux_system_codename: xenial
@@ -47,12 +47,12 @@
mtu: ${_param:interface_mtu}
proto: manual
type: eth
- tenant_interface:
- enabled: true
- name: ${_param:tenant_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
+ #tenant_interface:
+ # enabled: true
+ # name: ${_param:tenant_interface}
+ # mtu: ${_param:interface_mtu}
+ # proto: manual
+ # type: eth
br-mgmt:
enabled: true
type: bridge
@@ -79,6 +79,7 @@
name: ${_param:dpdk0_name}
pci: ${_param:dpdk0_pci}
driver: igb_uio
+ bridge: br-prv
# bond: dpdkbond1
enabled: true
type: dpdk_ovs_port