Update system reclass

Change-Id: I745a838b1f2f294b6c455700509ddf4b0264446f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

12 files changed, 14 insertions, 14 deletions

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
index e5f7e31c8..cd8b2fb6a 100644
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml.j2
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - system.defaults
   - system.linux.system.single
   - cluster.all-mcp-arch-common.opnfv
   - cluster.all-mcp-arch-common.passwords
@@ -14,8 +15,7 @@ parameters:
   _param:
     openstack_version: rocky
     armband_repo_version: ${_param:openstack_version}
-    apt_mk_version: nightly
-    mcp_repo_version: 1.1
+    mcp_version: nightly
 
     banner_company_name: OPNFV
 
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
index 22d62c578..5a6f27827 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j2
@@ -8,7 +8,7 @@
 {%- import 'net_map.j2' as nm with context %}
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.keepalived.cluster.single
   - system.glusterfs.server.volume.glance
   - system.glusterfs.server.volume.keystone
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index bed9bf05c..043a9498f 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
   - system.nova.compute.nfv.hugepages
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 9cb54da7e..227205e38 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.ceilometer.client
   - system.memcached.server.single
   - system.keystone.server.cluster
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
index 4b90ec2b8..63d39748f 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.galera.server.cluster
   - system.galera.server.database.aodh
   - system.galera.server.database.cinder
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
index 855e63267..abc734481 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.rabbitmq.server.cluster
   - system.rabbitmq.server.vhost.openstack
 parameters:
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
index 10222bfc5..1cde4d43b 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - system.nginx.server.single
   - system.nginx.server.proxy.openstack_api
   - system.nginx.server.proxy.openstack_vnc
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
index 7f2f269a7..1e9311aea 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.redis.server.single
   - system.ceilometer.server.cluster
   - system.ceilometer.server.coordination.redis
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
index 15418c71e..e61bb99ff 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml
@@ -15,7 +15,7 @@ classes:
   - system.ceilometer.client.nova_compute
   - system.ceilometer.client.cinder_volume
   - system.ceilometer.agent.polling.default
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.barbican.client.single
   - cluster.mcp-common-noha.openstack_compute_pdf
 parameters:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index cf0348c12..9f39d0306 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -8,7 +8,7 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.nfs.server
   - system.ceilometer.client
   - system.ceilometer.client.neutron
@@ -34,7 +34,7 @@ classes:
   - service.mysql.server.single
   - system.galera.server.database.cinder
   - system.galera.server.database.glance
-  - system.galera.server.database.grafana
+  - system.galera.server.database.neutron
   - system.galera.server.database.heat
   - system.galera.server.database.keystone
   - system.galera.server.database.nova
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index 5d9c62a7e..d97ac7a5c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - cluster.mcp-common-noha.openstack_gateway_pdf
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 4063754e0..ae787ec9a 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
+  - system.linux.system.repo.mcp.apt_mirantis.openstack
   - service.opendaylight.server.single
   - service.quagga.server.single
   - cluster.mcp-odl-noha