commit ecc84f031662409966d7bc723db77ef20507b1d0
author Jiri Broulik <jbroulik@mirantis.com> Tue Apr 25 18:50:30 2017 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Tue Apr 25 18:50:30 2017 +0200
tree 6895679a281b0e2efd8a8cdd386c88f242185189
parent 0489314512db2cd4d94e25b3d4690062b0b8c118

nfv labs fixes

Change-Id: I8a677cfde623d0da405d0e34ee4356390b7512ff

classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml

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

classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml

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