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>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 10703f3..c93adc6 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -386,9 +386,7 @@ done
 
 # Convert Pharos-compatible PDF to reclass network definitions
 if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
-    find "${RECLASS_CLUSTER_DIR}/${CLUSTER_DOMAIN%.local}" \
-         "${RECLASS_CLUSTER_DIR}/${DEPLOY_TYPE}-mcp-ocata-common" \
-         -name '*.j2' | while read -r tp
+    find "${RECLASS_CLUSTER_DIR}" -name '*.j2' | while read -r tp
     do
         if ! "${PHAROS_GEN_CONFIG_SCRIPT}" -y "${LOCAL_PDF}" \
           -j "${tp}" > "${tp%.j2}"; then

diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
index 0302464..55b4339 100644 (file)
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-ovs.local
+  domain: virtual-mcp-pike-ovs-noha.local
   states:
     - openstack
     - neutron_compute

diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index 02ab5b2..538ff9b 100644 (file)
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-ovs-dpdk.local
+  domain: virtual-mcp-pike-ovs-dpdk-noha.local
   states:
     - dpdk
     - openstack

diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index c9285ab..d1662ca 100644 (file)
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 cluster:
-  domain: virtual-mcp-pike-odl.local
+  domain: virtual-mcp-pike-odl-noha.local
   states:
     - opendaylight
     - openstack

diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore
index 57793d9..37e4ad7 100644 (file)
--- a/mcp/reclass/classes/cluster/.gitignore
+++ b/mcp/reclass/classes/cluster/.gitignore
@@ -1,4 +1,4 @@
-baremetal-mcp-ocata-common/infra/kvm_init.yml
-baremetal-mcp-ocata-common/openstack_compute_init.yml
-baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_init.yml
-baremetal-mcp-ocata-*/openstack/compute_init.yml
+baremetal-mcp-*/infra/kvm_init.yml
+baremetal-mcp-*/openstack_compute_init.yml
+baremetal-mcp-*-ovs-dpdk-ha/infra/config_init.yml
+baremetal-mcp-*/openstack/compute_init.yml

diff --git a/mcp/reclass/classes/cluster/README.rst b/mcp/reclass/classes/cluster/README.rst
index 6f7d06c..dc09cfb 100644 (file)
--- a/mcp/reclass/classes/cluster/README.rst
+++ b/mcp/reclass/classes/cluster/README.rst
@@ -14,10 +14,10 @@ Overview
 
 #. Common classes (specific to either baremetal or virtual deploys)
 
-   - baremetal-mcp-<release>-common
-   - virtual-mcp-<release>-common
+   - baremetal-mcp-<release>-common-ha
+   - virtual-mcp-<release>-common-noha
 
 #. Cluster specific classes
 
-   - baremetal-mcp-<release>-*
-   - virtual-mcp-<release>-*
+   - baremetal-mcp-<release>-*-{ha,noha}
+   - virtual-mcp-<release>-*-{ha,noha}

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
similarity index 98%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
index e0f9a2a..623eb34 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
@@ -97,7 +97,7 @@ parameters:
         #     - system.kibana.client.single
         openstack_control_node01:
           classes:
-            - cluster.baremetal-mcp-ocata-common.openstack_control_init
+            - cluster.baremetal-mcp-ocata-common-ha.openstack_control_init
           params:
             linux_system_codename: xenial
         openstack_control_node02:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
similarity index 97%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
index 55160bd..e20322a 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml
@@ -9,8 +9,8 @@
 classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
-  # - cluster.baremetal-mcp-ocata-common.stacklight
-  # - cluster.baremetal-mcp-ocata-common.stacklight.client
+  # - cluster.baremetal-mcp-ocata-common-ha.stacklight
+  # - cluster.baremetal-mcp-ocata-common-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: nightly

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
similarity index 98%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
index ce7fc85..39ced15 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml
@@ -23,7 +23,7 @@ classes:
   # - system.salt.control.cluster.stacklight_server_cluster
   # - system.salt.control.cluster.stacklight_log_cluster
   # - system.salt.control.cluster.stacklight_telemetry_cluster
-  - cluster.baremetal-mcp-ocata-common.infra.kvm_init
+  - cluster.baremetal-mcp-ocata-common-ha.infra.kvm_init
 parameters:
   _param:
     linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_init.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
similarity index 97%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
index e07e611..47ef1f7 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml
@@ -18,7 +18,7 @@ classes:
   - system.cinder.volume.single
   - system.cinder.volume.backend.lvm
   - system.ceilometer.agent.cluster
-  - cluster.baremetal-mcp-ocata-common.openstack_compute_init
+  - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_init
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_init.yml.j2

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control_init.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database_init.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_init.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml
rename to mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml

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 0d2c5a3..7733008 100644 (file)
--- 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 efcf1a4..7cc82dd 100644 (file)
--- 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 d7bbadd..01e4a6b 100644 (file)
--- 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 5b842bb..c51650a 100644 (file)
--- 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/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 4418b0f..3c93972 100644 (file)
--- 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,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-odl-ha.openstack.compute_init
   - cluster.baremetal-mcp-ocata-odl-ha.infra
   - system.neutron.gateway.opendaylight.single

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 210da2a..9f729f9 100644 (file)
--- 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/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index fc38aad..f6e46d7 100644 (file)
--- 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/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index 9a04c84..fa1ed10 100644 (file)
--- 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 5757db3..78d6e8e 100644 (file)
--- 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 a516803..9549a63 100644 (file)
--- 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 fd4f7e8..32ebb05 100644 (file)
--- 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

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 149fff5..4a7e4cd 100644 (file)
--- 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 60278a5..9659c0b 100644 (file)
--- 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 f7a8fe3..e4506ca 100644 (file)
--- 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 3ec33c3..f4e71ed 100644 (file)
--- 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 e610dc9..98b182c 100644 (file)
--- 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 dddae33..9a98ba9 100644 (file)
--- 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 e76b20a..fa65fbc 100644 (file)
--- 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 5e855ac..4ef7ffc 100644 (file)
--- 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 a01eda9..fb33124 100644 (file)
--- 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 63ff2c8..1fcde7e 100644 (file)
--- 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 d38cc0d..de41a81 100644 (file)
--- 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

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
index c325246..e71f638 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.baremetal-mcp-ocata-common.infra.config
+  - cluster.baremetal-mcp-ocata-common-ha.infra.config
   - cluster.baremetal-mcp-ocata-ovs-ha.infra

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index a15355b..044c05e 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ha.openstack
 parameters:
   _param:

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index 51bf6ae..ea15224 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ha.infra

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index 9121299..692f741 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-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-ha.infra

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 9ed3a80..79f297f 100644 (file)
--- 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 790c6d9..6d12093 100644 (file)
--- 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 fae7c5b..91ae84c 100644 (file)
--- 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 27fd404..9ccbc08 100644 (file)
--- 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 986422b..3ce5613 100644 (file)
--- 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 9288e6f..ff6246b 100644 (file)
--- 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 6b2349e..b8e857d 100644 (file)
--- 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

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/haproxy_openstack_api.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/haproxy_openstack_api.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/config.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/infra/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/init.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/init_options.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/init_options.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_compute.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_compute.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
similarity index 98%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
index 44c1407..9825674 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_control.yml
@@ -43,7 +43,7 @@ classes:
   - system.aodh.server.single
   - system.horizon.server.single
   - service.haproxy.proxy.single
-  - cluster.virtual-mcp-pike-common.haproxy_openstack_api
+  - cluster.virtual-mcp-pike-common-noha.haproxy_openstack_api
 parameters:
   _param:
     linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_gateway.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml
similarity index 100%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
index 4fd8e75..19dc9fe 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/infra/config.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.reclass.storage.system.opendaylight_control_single
-  - cluster.virtual-mcp-pike-common.infra.config
-  - cluster.virtual-mcp-pike-odl
+  - cluster.virtual-mcp-pike-common-noha.infra.config
+  - cluster.virtual-mcp-pike-odl-noha
 parameters:
   reclass:
     storage:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
similarity index 71%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
index 8501f03..6a4ef9a 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/init.yml
@@ -9,12 +9,12 @@
 classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
-  - cluster.virtual-mcp-pike-common.init_options
-  - cluster.virtual-mcp-pike-common.infra
-  - cluster.virtual-mcp-pike-odl.openstack
+  - cluster.virtual-mcp-pike-common-noha.init_options
+  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-odl-noha.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-odl.local
-    cluster_name: virtual-mcp-pike-odl
+    cluster_domain: virtual-mcp-pike-odl-noha.local
+    cluster_name: virtual-mcp-pike-odl-noha
     opendaylight_service_host: 172.16.10.111

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml
similarity index 97%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml
index 58b461e..f4404a6 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/opendaylight/control.yml
@@ -10,7 +10,7 @@ classes:
   - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.mcp.extra
   - system.opendaylight.server.single
-  - cluster.virtual-mcp-pike-odl
+  - cluster.virtual-mcp-pike-odl-noha
 parameters:
   _param:
     linux_system_codename: xenial

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
similarity index 94%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
index 34416f6..6b2ca8e 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_compute
-  - cluster.virtual-mcp-pike-odl
+  - cluster.virtual-mcp-pike-common-noha.openstack_compute
+  - cluster.virtual-mcp-pike-odl-noha
 parameters:
   opendaylight:
     client:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml
index f904d64..ede9d4c 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.opendaylight.single
-  - cluster.virtual-mcp-pike-common.openstack_control
-  - cluster.virtual-mcp-pike-odl
+  - cluster.virtual-mcp-pike-common-noha.openstack_control
+  - cluster.virtual-mcp-pike-odl-noha
 parameters:
   neutron:
     server:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml
index 00725e9..47d11cd 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
   - system.neutron.gateway.opendaylight.single
-  - cluster.virtual-mcp-pike-odl
+  - cluster.virtual-mcp-pike-odl-noha
 parameters:
   _param:
     neutron_agents:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
similarity index 92%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
index 906d79a..cbf4e69 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-odl/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-odl-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_init
+  - cluster.virtual-mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
index a346bac..70dcd2f 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/infra/config.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.infra.config
-  - cluster.virtual-mcp-pike-ovs-dpdk
+  - cluster.virtual-mcp-pike-common-noha.infra.config
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
   reclass:
     storage:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
similarity index 68%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
index 528125b..e6a7da4 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/init.yml
@@ -9,11 +9,11 @@
 classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
-  - cluster.virtual-mcp-pike-common.init_options
-  - cluster.virtual-mcp-pike-common.infra
-  - cluster.virtual-mcp-pike-ovs.openstack
+  - cluster.virtual-mcp-pike-common-noha.init_options
+  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-ovs.local
-    cluster_name: virtual-mcp-pike-ovs
+    cluster_domain: virtual-mcp-pike-ovs-dpdk-noha.local
+    cluster_name: virtual-mcp-pike-ovs-dpdk-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
similarity index 91%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
index fdb4219..0f53477 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/compute.yml
@@ -9,8 +9,8 @@
 classes:
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
-  - cluster.virtual-mcp-pike-common.openstack_compute
-  - cluster.virtual-mcp-pike-ovs-dpdk
+  - cluster.virtual-mcp-pike-common-noha.openstack_compute
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     compute:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml
similarity index 85%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml
index b368a2c..4dbaae8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/control.yml
@@ -8,8 +8,8 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-pike-common.openstack_control
-  - cluster.virtual-mcp-pike-ovs-dpdk
+  - cluster.virtual-mcp-pike-common-noha.openstack_control
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     server:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
similarity index 88%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
index 07691fb..ec943a8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-pike-ovs-dpdk
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha
 parameters:
   neutron:
     gateway:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml
similarity index 93%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml
index 02d24ca..5445a07 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_init
+  - cluster.virtual-mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vlan"

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
similarity index 83%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
index 788fd2f..dcf8777 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/infra/config.yml
@@ -7,5 +7,5 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.infra.config
-  - cluster.virtual-mcp-pike-ovs
+  - cluster.virtual-mcp-pike-common-noha.infra.config
+  - cluster.virtual-mcp-pike-ovs-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
similarity index 69%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
index 66d5e3f..d217a69 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/init.yml
@@ -9,11 +9,11 @@
 classes:
   - system.linux.system.single
   - cluster.all-mcp-arch-common
-  - cluster.virtual-mcp-pike-common.init_options
-  - cluster.virtual-mcp-pike-common.infra
-  - cluster.virtual-mcp-pike-ovs-dpdk.openstack
+  - cluster.virtual-mcp-pike-common-noha.init_options
+  - cluster.virtual-mcp-pike-common-noha.infra
+  - cluster.virtual-mcp-pike-ovs-noha.openstack
 
 parameters:
   _param:
-    cluster_domain: virtual-mcp-pike-ovs-dpdk.local
-    cluster_name: virtual-mcp-pike-ovs-dpdk
+    cluster_domain: virtual-mcp-pike-ovs-noha.local
+    cluster_name: virtual-mcp-pike-ovs-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
similarity index 88%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
index ea64da1..11e0d52 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/compute.yml
@@ -7,8 +7,8 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_compute
-  - cluster.virtual-mcp-pike-ovs
+  - cluster.virtual-mcp-pike-common-noha.openstack_compute
+  - cluster.virtual-mcp-pike-ovs-noha
 parameters:
   linux:
     network:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml
similarity index 84%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml
index 070e488..4e03c4b 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/control.yml
@@ -8,5 +8,5 @@
 ---
 classes:
   - system.neutron.control.openvswitch.single
-  - cluster.virtual-mcp-pike-common.openstack_control
-  - cluster.virtual-mcp-pike-ovs
+  - cluster.virtual-mcp-pike-common-noha.openstack_control
+  - cluster.virtual-mcp-pike-ovs-noha

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml
similarity index 89%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml
index fe2f012..0eec95c 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/gateway.yml
@@ -7,9 +7,9 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_gateway
+  - cluster.virtual-mcp-pike-common-noha.openstack_gateway
   - service.neutron.gateway.single
-  - cluster.virtual-mcp-pike-ovs
+  - cluster.virtual-mcp-pike-ovs-noha
 parameters:
   linux:
     network:

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml
similarity index 90%
rename from mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
rename to mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml
index 5a4c444..19126f8 100644 (file)
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-noha/openstack/init.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-common.openstack_init
+  - cluster.virtual-mcp-pike-common-noha.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml
similarity index 86%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml
rename to mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml
index 4b8e883..8828a93 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-odl-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-odl.infra.config
+  - cluster.virtual-mcp-pike-odl-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-odl.local
+      domain: virtual-mcp-pike-odl-noha.local

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml
similarity index 84%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml
rename to mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml
index bf68ab8..4c435f8 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-dpdk-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-ovs-dpdk.infra.config
+  - cluster.virtual-mcp-pike-ovs-dpdk-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-ovs-dpdk.local
+      domain: virtual-mcp-pike-ovs-dpdk-noha.local

diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml
similarity index 86%
rename from mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml
rename to mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml
index 514946b..7a715cf 100644 (file)
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-pike-ovs-noha.local.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - cluster.virtual-mcp-pike-ovs.infra.config
+  - cluster.virtual-mcp-pike-ovs-noha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
@@ -15,4 +15,4 @@ parameters:
   linux:
     system:
       name: cfg01
-      domain: virtual-mcp-pike-ovs.local
+      domain: virtual-mcp-pike-ovs-noha.local