Allign offline repos for q3
* add system.defaults into virtual-offline-(ssl|pike-ovs)/infra/init.yml
* Switch reclass submodule to forever-master
* Fix few other mirrors
Change-Id: I220627dc4484ddeed14f9546569bc6c2e06fda67
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
index 36c6046..a556771 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/cicd/control/init.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.haveged
- - system.linux.system.repo_local.mcp.apt_mirantis.docker
- - system.linux.system.repo_local.mcp.extra
+ - system.linux.system.repo.mcp.apt_mirantis.docker
+ - system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
- system.linux.system.repo.mcp.apt_mirantis.saltstack
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 645612b..5413b91 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -3,10 +3,9 @@
- system.linux.system.single
- system.linux.system.single.debian
- system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.salt
-- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
- system.glusterfs.client.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
index c0759e7..eb57f3f 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
@@ -1,10 +1,10 @@
classes:
- system.defaults
- system.linux.network.dynamic_hosts
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.single
- system.linux.system.single.debian
- system.watchdog.server
@@ -18,6 +18,7 @@
- cluster.virtual-offline-pike-ovs-dpdk.openstack
- cluster.virtual-offline-pike-ovs-dpdk.cicd
parameters:
+
_param:
cluster_domain: virtual-offline-pike-ovs-dpdk.local
cluster_name: virtual-offline-pike-ovs-dpdk
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index 633c0ae..280bb35 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -1,8 +1,8 @@
classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index a17ba89..0cb1570 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -1,10 +1,11 @@
classes:
- system.linux.system.lowmem
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.percona
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
index 24f2b4b..47e3930 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.horizon.server.single
- cluster.virtual-offline-pike-ovs-dpdk.infra
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
index afbe64b..ade8bb1 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -1,6 +1,6 @@
classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.neutron.gateway.cluster
- cluster.virtual-offline-pike-ovs-dpdk.infra
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
index c1c831b..f6828cc 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/share.yml
@@ -1,8 +1,8 @@
classes:
- system.linux.system.lowmem
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- cluster.virtual-offline-pike-ovs-dpdk.infra
parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
index b664387..830b112 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/telemetry.yml
@@ -1,9 +1,9 @@
classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.ceph
- system.memcached.server.single
- system.apache.server.single
- system.apache.server.site.gnocchi