refactoring of mcp repositories
Change-Id: I6cb3bd7fc2a983d83b0e11d4262fad24a1037cc2
diff --git a/classes/cluster/virtual-mcp10-contrail/infra/config.yml b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
index 6563a6b..ec64f71 100755
--- a/classes/cluster/virtual-mcp10-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-contrail/infra/config.yml
@@ -1,7 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
index 2262899..8c50b04 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -1,7 +1,8 @@
classes:
-- system.linux.system.repo.mcp_contrail
-#- system.linux.system.repo.mos9
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
- system.opencontrail.compute.cluster
- system.heka.alarm.openstack_compute
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 18d5f69..4dc30b3 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -1,8 +1,9 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.mcp_contrail
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
index 2c4a32e..0c6e349 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/dashboard.yml
@@ -1,5 +1,8 @@
classes:
- system.linux.system.repo.tcp_mk20
+#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.horizon.server.single
- cluster.virtual-mcp10-contrail
parameters:
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
index ed8513a..81ac134 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_version: mitaka
+ apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_host: _
diff --git a/classes/cluster/virtual-mcp10-dvr/infra/config.yml b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
index 4c09279..e1ca1e7 100644
--- a/classes/cluster/virtual-mcp10-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-dvr/infra/config.yml
@@ -1,7 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
index 8f533f7..43d3ab7 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
@@ -1,5 +1,7 @@
classes:
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.linux.network.interface.single_ovs_dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
index a4a85a6..e6b54bf 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/control.yml
@@ -1,7 +1,8 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
index d14746a..b38a35a 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/dashboard.yml
@@ -1,4 +1,7 @@
classes:
+#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.linux.system.repo.tcp_mk20
- system.horizon.server.single
- cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
index ce4ceba..1c4767c 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/gateway.yml
@@ -1,6 +1,7 @@
classes:
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
- system.linux.network.interface.single_ovs_dvr
- system.neutron.gateway.cluster
- cluster.virtual-mcp10-dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
index 4bd5ae1..ef4ae20 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_version: mitaka
+ apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_host: 172.16.10.254
diff --git a/classes/cluster/virtual-mcp10-ovs/infra/config.yml b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
index 951ba2b..99b4212 100644
--- a/classes/cluster/virtual-mcp10-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp10-ovs/infra/config.yml
@@ -1,7 +1,7 @@
classes:
- service.git.client
- system.linux.system.single
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.api
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
index 9e0290a..0c22c07 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/compute.yml
@@ -1,5 +1,7 @@
classes:
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.heka.alarm.openstack_compute
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
index 268c4d5..d8dde28 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/control.yml
@@ -1,7 +1,8 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
index d090842..2088261 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/dashboard.yml
@@ -1,4 +1,6 @@
classes:
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
- system.linux.system.repo.tcp_mk20
- service.horizon.server.single
- cluster.virtual-mcp10-ovs
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
index 79aa1df..b885e41 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/gateway.yml
@@ -1,6 +1,7 @@
classes:
-- system.linux.system.repo.mcp10
-- system.linux.system.repo.tcp_extra
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
- cluster.virtual-mcp10-ovs
parameters:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
index a6f550c..e7e6025 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
openstack_version: mitaka
+ apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
diff --git a/classes/system b/classes/system
index c964e6e..35943f3 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit c964e6eef2d5ebc89ba41dac3673d86146cac050
+Subproject commit 35943f34f9d6c54637f546749540a6209bc72c9e