nfv labs fixes
Change-Id: I8a677cfde623d0da405d0e34ee4356390b7512ff
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 7b96ef7..6bfbcc3 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -2,8 +2,9 @@
- system.linux.system.lowmem
- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
+- 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
@@ -29,6 +30,7 @@
opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
opencontrail_router01_address: 172.16.10.131
openstack_version: mitaka
+ linux_system_codename: trusty
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index 71bcb06..84af019 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.system.repo.glusterfs
- system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mos10
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
index 18ed62a..f10813b 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
index 60f9943..e9d2f9f 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.api
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index 786aa4d..e5c0b06 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
mcp_repo_version: 1.1
openstack_region: RegionOne