nfv virtual lab fixes
Change-Id: I657e75df6603bcf6b4a6725ea1d69efba522e44e
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
index 3da1578..04d25d2 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/infra/config.yml
@@ -92,7 +92,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: 172.16.10.105
- compute_vrouter_dpdk_mac_address: 90:e2:ba:19:c2:19 #must be mac of ens4
+ compute_vrouter_dpdk_mac_address: 02:9e:de:d3:5b:ce #must be manually changed to mac of ens4
compute_vrouter_dpdk_pci: "'0000:00:04.0'"
openstack_compute_node02:
name: ${_param:openstack_compute_node02_hostname}
@@ -103,5 +103,5 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: ${_param:linux_system_codename}
single_address: 172.16.10.106
- compute_vrouter_dpdk_mac_address: 00:1b:21:87:21:99 #must be mac of ens4
+ compute_vrouter_dpdk_mac_address: 02:de:aa:e6:12:81 #must be manually changed to mac of ens4
compute_vrouter_dpdk_pci: "'0000:00:04.0'"
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 6bfbcc3..439ee4f 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -3,8 +3,6 @@
- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
-- system.linux.system.repo.ubuntu
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
index f09c9c6..9a7b4a4 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
@@ -46,6 +46,10 @@
# - /usr/lib/contrail/if-vhost0
# use_interfaces:
# - ens4
+ system:
+ package:
+ liburcu4:
+ version: 0.9.1-3
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -70,3 +74,4 @@
common:
network:
host: ${_param:openstack_control_address}
+
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 5919aed..a111de2 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -80,15 +80,15 @@
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
- dpdk0_name: ens4
- dpdk0_pci: '"0000:00:04.0"'
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:00:05.0"'
openstack_compute_node02:
params:
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
- dpdk0_name: ens4
- dpdk0_pci: '"0000:00:04.0"'
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:00:05.0"'
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
index 80408fb..db35cb0 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/compute.yml
@@ -70,10 +70,16 @@
# use_interfaces:
# - ${_param:tenant_interface}
###
+ # dpdkbond1:
+ # enabled: true
+ # bridge: br-prv
+ # type: dpdk_ovs_bond
+ # mode: active-backup
dpdk0:
name: ${_param:dpdk0_name}
pci: ${_param:dpdk0_pci}
driver: igb_uio
+# bond: dpdkbond1
enabled: true
type: dpdk_ovs_port
n_rxq: 2
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
index 1cf25df..60a8d20 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/gateway.yml
@@ -33,56 +33,46 @@
mtu: ${_param:interface_mtu}
proto: manual
type: eth
- # br-floating:
- # enabled: true
- # type: ovs_bridge
- # mtu: ${_param:interface_mtu}
- # br-mgmt:
- # enabled: true
- # type: bridge
- # proto: static
- # address: ${_param:single_address}
- # netmask: 255.255.255.0
- # mtu: ${_param:interface_mtu}
- # use_interfaces:
- # - ${_param:primary_interface}
- # br-mesh:
- # enabled: true
- # type: bridge
- # mtu: ${_param:interface_mtu}
- # proto: static
- # address: ${_param:tenant_address}
- # netmask: 255.255.255.0
- # use_interfaces:
- # - ${_param:tenant_interface}
-
- br_ctl:
+ external_interface:
enabled: true
- type: ovs_port
- bridge: br-floating
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ br-mgmt:
+ enabled: true
+ type: bridge
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
mtu: ${_param:interface_mtu}
use_interfaces:
- ${_param:primary_interface}
- br-floating:
+ br-mesh:
enabled: true
- type: ovs_bridge
- br-prv:
- enabled: true
- type: ovs_bridge
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
address: ${_param:tenant_address}
netmask: 255.255.255.0
- floating-to-prv:
+ use_interfaces:
+ - ${_param:tenant_interface}
+ float-to-ex:
enabled: true
type: ovs_port
- port_type: patch
+ mtu: ${_param:interface_mtu}
bridge: br-floating
- peer: prv-to-floating
- prv-to-floating:
+ br-ex:
enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-prv
- peer: floating-to-prv
\ No newline at end of file
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ address: ${_param:external_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:external_interface}
+ use_ovs_ports:
+ - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index 3a8b30c..6171a3c 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -32,7 +32,7 @@
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x400"
+ compute_ovs_dpdk_lcore_mask: "0x1"
compute_ovs_memory_channels: "2"
cluster_node01_hostname: ctl01