switch ubuntu|glusterfs|saltstack to new reclass
Change-Id: I3a4ff00078b6144eff76ec0b55063cc1b57049dd
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 d0b124d..1465125 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.single.debian
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
#- system.openssh.client.lab
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 1ebd750..ebf843d 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -4,8 +4,8 @@
- system.heka.log_collector.single
- system.heka.log_collector.output.telegraf
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.single
- system.linux.system.single.debian
- system.watchdog.server
@@ -25,6 +25,9 @@
cluster_name: virtual-offline-pike-ovs-dpdk
infra_config_hostname: cfg01
local_repos: true
+ # new in 2018.7+
+ linux_system_repo_url: http://${_param:local_repo_url}/${_param:apt_mk_version}/
+ #
local_repo_url: mirror.mcp.mirantis.local.test
linux_repo_refresh_db: true
aptly_server_address: 10.170.0.226
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 2e0f028..e8a17b5 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.ceph
- system.linux.network.hosts
- system.nova.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 f6513bb..90f5f24 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -1,9 +1,9 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.ceph
- system.memcached.server.single
- system.rabbitmq.server.cluster
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 e8f77b5..2c20b03 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
@@ -1,8 +1,8 @@
classes:
-- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- 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_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.horizon.server.single
- cluster.virtual-offline-pike-ovs-dpdk
parameters:
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 aaf8596..9e0e96a 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.neutron.gateway.cluster
- cluster.virtual-offline-pike-ovs-dpdk
parameters: