diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha')
15 files changed, 13 insertions, 40 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 0d2c5a303..7733008b2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -8,7 +8,7 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: reclass: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index efcf1a4e7..7cc82dd31 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-common-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index d7bbadd75..01e4a6b99 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: salt: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index 5b842bba9..c51650ac8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-common-ha.infra.maas - cluster.baremetal-mcp-ocata-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml index bd8e46907..474ee6d70 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.all-mcp-ocata-common + - cluster.all-mcp-arch-common - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index 4418b0fde..cec60a871 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -8,8 +8,8 @@ --- classes: - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common.openstack_compute - - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute + - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_pdf - cluster.baremetal-mcp-ocata-odl-ha.infra - system.neutron.gateway.opendaylight.single parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 index 7809bd8c8..7809bd8c8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml index 210da2ad5..9f729f915 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -8,7 +8,7 @@ --- classes: - system.neutron.control.opendaylight.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: neutron: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml deleted file mode 100644 index deb4cd7e9..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml +++ /dev/null @@ -1,17 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.keystone.client.single - - system.keystone.client.service.aodh - - system.keystone.client.service.ceilometer - - system.keystone.client.service.nova21 - - system.keystone.client.service.nova-placement - - system.keystone.client.service.glare - - system.keystone.client.service.cinder3 - - system.keystone.client.service.designate diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml index fc38aada6..f6e46d788 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml deleted file mode 100644 index 731fe6ed6..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml +++ /dev/null @@ -1,10 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - system.mysql.client.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml index 9a04c84d0..fa1ed1072 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: # opendaylight options diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml index 5757db3a6..78d6e8ec6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml index a516803fa..9549a63aa 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: nginx: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml index fd4f7e8d1..32ebb05e9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-odl-ha.infra |