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-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index dc75093..6cde820 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -1,8 +1,7 @@
classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- 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_local.mcp.apt_mirantis.ceph
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.network.hosts
- system.linux.storage.loopback
- system.nova.compute.cluster
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index b196b83..aa7010a 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -2,10 +2,11 @@
- system.salt.minion.cert.proxy
- 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-ssl/openstack/dashboard.yml b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
index b897c93..51bb0cf 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
@@ -1,8 +1,8 @@
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.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.extra
- system.horizon.server.single
- cluster.virtual-offline-ssl
parameters:
diff --git a/classes/cluster/virtual-offline-ssl/openstack/gateway.yml b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
index 98321cc..8fa9924 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-ssl/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-ssl
@@ -85,4 +85,4 @@
use_interfaces:
- ${_param:external_interface}
use_ovs_ports:
- - float-to-ex
\ No newline at end of file
+ - float-to-ex
diff --git a/classes/cluster/virtual-offline-ssl/openstack/share.yml b/classes/cluster/virtual-offline-ssl/openstack/share.yml
index 1d083f3..0a49abe 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-offline-ssl/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
- system.linux.storage.loopback_manila
- system.manila.share
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
index a59b9a7..a3d8230 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -1,10 +1,10 @@
classes:
- system.salt.minion.cert.proxy
-- 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