summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-ha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j23
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml2
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j22
7 files changed, 8 insertions, 7 deletions
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 6ae5b0221..822e8bfb7 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,6 @@
{%- import 'net_map.j2' as nm with context %}
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.keepalived.cluster.single
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
@@ -22,6 +21,7 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
- cluster.mcp-common-ha.infra.kvm_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
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 043a9498f..85e69b666 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,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.glusterfs.client.cluster
- system.nova.compute.cluster
- system.nova.compute.nfv.hugepages
@@ -17,6 +16,7 @@ classes:
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- service.barbican.client.cluster
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
- cluster.mcp-common-ha.openstack_compute_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
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 227205e38..4f36c0fb1 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,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.ceilometer.client
- system.memcached.server.single
- system.keystone.server.cluster
@@ -28,6 +27,7 @@ classes:
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
- system.glusterfs.client.volume.keystone
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.glusterfs_repo
{%- if not conf.MCP_VCP %}
# sync from kvm
@@ -45,6 +45,7 @@ classes:
# - system.salt.control.cluster.stacklight_server_cluster
# - system.salt.control.cluster.stacklight_log_cluster
# - system.salt.control.cluster.stacklight_telemetry_cluster
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-ha.infra.kvm_pdf
- cluster.all-mcp-arch-common.opnfv.maas_proxy
- cluster.all-mcp-arch-common.opnfv.lab_proxy_pdf
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 63d39748f..9ed3f70cd 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,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.galera.server.cluster
- system.galera.server.database.aodh
- system.galera.server.database.cinder
@@ -21,6 +20,7 @@ classes:
- system.galera.server.database.neutron
- system.galera.server.database.panko
- system.galera.server.database.barbican
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_vip_interface: ${_param:single_nic}
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 abc734481..1871c2efa 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,9 +7,9 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_vip_interface: ${_param:single_nic}
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 979669312..cef23c9ee 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,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
@@ -20,6 +19,7 @@ classes:
- system.sphinx.server.doc.reclass
- service.keepalived.cluster.single
- system.keepalived.cluster.instance.openstack_web_public_vip
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
cluster_vip_address: ${_param:openstack_proxy_address}
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 1e9311aea..0ec9d25db 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,6 @@
##############################################################################
---
classes:
- - system.linux.system.repo.mcp.apt_mirantis.openstack
- service.redis.server.single
- system.ceilometer.server.cluster
- system.ceilometer.server.coordination.redis
@@ -23,6 +22,7 @@ classes:
- system.gnocchi.common.storage.redis
- system.gnocchi.common.coordination.redis
- system.panko.server.cluster
+ - cluster.all-mcp-arch-common.backports
parameters:
_param:
keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}