Add model to support aic ocata tests
Change-Id: I0e4813ff5f29686bd553f5e750c6d5f14b1133ae
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
index 0d3ef1b..14b3d15 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/compute.yml
@@ -1,6 +1,5 @@
classes:
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 7bfd114..fbd1676 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -1,8 +1,7 @@
classes:
- system.linux.system.lowmem
- system.linux.system.repo.glusterfs
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
index 749161a..1667347 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/dashboard.yml
@@ -1,8 +1,7 @@
classes:
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- service.horizon.server.single
- cluster.virtual-mcp11-ovs
parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
index 3288e7f..9457482 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/gateway.yml
@@ -1,6 +1,5 @@
classes:
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 433f8a3..8d97267 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -2,6 +2,7 @@
_param:
openstack_version: newton
apt_mk_version: nightly
+ mcp_repo_version: 1.1
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http