Rename reclass models to add "-ha" or "-noha" 05/49805/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 28 Nov 2017 19:27:05 +0000 (20:27 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 31 Dec 2017 01:11:34 +0000 (02:11 +0100)
commitf30d534e080a43aed078b7aadbc4db9dab95dcf6
tree7d01b418ed0ea2b327b8ad63acb3ef9c08e3a4f9
parent565454013b305e6a95b103a37351478c0090bb6b
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 <Alexandru.Avadanii@enea.com>
(cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521)
85 files changed:
ci/deploy.sh
mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
mcp/reclass/classes/cluster/.gitignore
mcp/reclass/classes/cluster/README.rst
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml with 98% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml with 97% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml with 98% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2 [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml with 97% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2 [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml [moved from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml with 100% similarity]
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/haproxy_openstack_api.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/init_options.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_compute.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_control.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml with 98% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_gateway.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml with 100% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/infra/config.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml with 89% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml with 68% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/opendaylight/control.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml with 96% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml with 94% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml with 92% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml with 92% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml with 94% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/infra/config.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml with 89% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml with 67% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml with 91% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml with 85% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml with 88% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml with 93% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml with 83% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml with 69% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml with 88% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml with 83% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml with 89% similarity]
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml [moved from mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml with 90% similarity]
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router-noha.local.yml [moved from mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml with 84% similarity]
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk-noha.local.yml [moved from mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml with 84% similarity]
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-noha.local.yml [moved from mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml with 85% similarity]