From f30d534e080a43aed078b7aadbc4db9dab95dcf6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 28 Nov 2017 20:27:05 +0100 Subject: Rename reclass models to add "-ha" or "-noha" Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii (cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521) --- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 9ed3a80ea..79f297fe4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 790c6d9a3..6d120935a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -8,5 +8,5 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index fae7c5bc3..91ae84cb3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml index 27fd40480..9ccbc08a9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 986422baf..3ce561374 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index 9288e6f81..ff6246b75 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index 6b2349e25..b8e857d8d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ovs-ha.infra -- cgit 1.2.3-korg