From 09dce2a2643223d66aa1ac3a0ad8feebc082f521 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 --- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml | 2 +- .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml | 2 +- .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha') diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml index 149fff5ff..4a7e4cdcb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 60278a5b3..9659c0b42 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index f7a8fe352..e4506ca6a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml index 3ec33c39a..f4e71ed5b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index e610dc930..98b182ce0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -8,7 +8,7 @@ --- classes: - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - system.neutron.compute.nfv.dpdk parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml index dddae33c4..9a98ba9c1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml @@ -8,7 +8,7 @@ --- 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-dpdk-ha.infra parameters: neutron: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml index e76b20ae6..fa65fbced 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml index 5e855ac4f..4ef7ffc96 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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,vlan" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml index a01eda9a4..fb3312417 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml index 63ff2c87e..1fcde7ecd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml index d38cc0d0b..de41a81d3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-dpdk-ha.infra -- cgit 1.2.3-korg