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}
+