Code Review
/
fuel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
5654540
)
Rename reclass models to add "-ha" or "-noha"
05/49805/1
author
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Tue, 28 Nov 2017 19:27:05 +0000
(20:27 +0100)
committer
Alexandru Avadanii
<Alexandru.Avadanii@enea.com>
Sun, 31 Dec 2017 01:11:34 +0000
(
02:11
+0100)
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
patch
|
blob
|
history
mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
patch
|
blob
|
history
mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
patch
|
blob
|
history
mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
patch
|
blob
|
history
mcp/reclass/classes/cluster/.gitignore
patch
|
blob
|
history
mcp/reclass/classes/cluster/README.rst
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
patch
|
blob
|
history
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
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]
patch
|
blob
|
history
diff --git
a/ci/deploy.sh
b/ci/deploy.sh
index
bf6b6be
..
fd3911d
100755
(executable)
--- a/
ci/deploy.sh
+++ b/
ci/deploy.sh
@@
-368,9
+368,7
@@
done
# Convert Pharos-compatible PDF to reclass network definitions
if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
# 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
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
2f4d401
..
6eedeae
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:
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-ocata-ovs
-noha
.local
states:
- openstack
- neutron_compute
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
a1a9e41
..
1e33bda
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:
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-ovs-dpdk.local
+ domain: virtual-mcp-ocata-ovs-dpdk
-noha
.local
states:
- dpdk
- openstack
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
7892353
..
d6e2601
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:
##############################################################################
---
cluster:
- domain: virtual-mcp-ocata-odl-router.local
+ domain: virtual-mcp-ocata-odl-router
-noha
.local
states:
- opendaylight
- openstack
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
3fec9b0
..
446b501
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)
#. Common classes (specific to either baremetal or virtual deploys)
- - baremetal-mcp-ocata-common
- - virtual-mcp-ocata-common
+ - baremetal-mcp-ocata-common
-ha
+ - virtual-mcp-ocata-common
-noha
#. Cluster specific classes
#. Cluster specific classes
- - baremetal-mcp-ocata-*
- - virtual-mcp-ocata-*
+ - baremetal-mcp-ocata-*
-{ha,noha}
+ - virtual-mcp-ocata-*
-{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:
# - 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:
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
ef18015
..
a7a0404
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-ocata-common
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-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
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
# - 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
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
- 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}
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
---
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:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra
- cluster.baremetal-mcp-ocata-odl-ha.openstack
parameters:
_param:
- 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:
##############################################################################
---
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:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.maas
- cluster.baremetal-mcp-ocata-odl-ha.infra
- 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
---
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
- 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
---
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:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_database
- cluster.baremetal-mcp-ocata-odl-ha
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_init
parameters:
_param:
# opendaylight options
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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_message_queue
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_message_queue
- cluster.baremetal-mcp-ocata-odl-ha
- 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:
##############################################################################
---
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:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_telemetry
- cluster.baremetal-mcp-ocata-odl-ha.infra
- 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:
##############################################################################
---
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
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
parameters:
_param:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.kvm
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.kvm
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.maas
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- 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
---
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:
- 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
---
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:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_database
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
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:
##############################################################################
---
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
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_proxy
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.config
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.config
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra
- cluster.baremetal-mcp-ocata-ovs-ha.openstack
parameters:
_param:
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.kvm
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.kvm
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.infra.maas
+ - cluster.baremetal-mcp-ocata-common
-ha
.infra.maas
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- 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:
##############################################################################
---
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:
- 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
---
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
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_database
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_database
- cluster.baremetal-mcp-ocata-ovs-ha
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_init
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_message_queue
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_message_queue
- cluster.baremetal-mcp-ocata-ovs-ha
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_proxy
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_proxy
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- 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:
##############################################################################
---
classes:
- - cluster.baremetal-mcp-ocata-common.openstack_telemetry
+ - cluster.baremetal-mcp-ocata-common
-ha
.openstack_telemetry
- cluster.baremetal-mcp-ocata-ovs-ha.infra
- cluster.baremetal-mcp-ocata-ovs-ha.infra
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/haproxy_openstack_api.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/haproxy_openstack_api.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/config.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/init.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/infra/init.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/init_options.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/init_options.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_compute.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_compute.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_control.yml
similarity index 98%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_control.yml
index
ab58339
..
c897bfd
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_control.yml
@@
-45,7
+45,7
@@
classes:
- system.aodh.server.single
- system.horizon.server.single
- service.haproxy.proxy.single
- system.aodh.server.single
- system.horizon.server.single
- service.haproxy.proxy.single
- - cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+ - cluster.virtual-mcp-ocata-common
-noha
.haproxy_openstack_api
parameters:
_param:
linux_system_codename: xenial
parameters:
_param:
linux_system_codename: xenial
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_gateway.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_gateway.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml
similarity index 100%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-common-noha/openstack_init.yml
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/infra/config.yml
similarity index 89%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/infra/config.yml
index
24c3028
..
22cdec2
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/infra/config.yml
@@
-8,8
+8,8
@@
---
classes:
- system.reclass.storage.system.opendaylight_control_single
---
classes:
- system.reclass.storage.system.opendaylight_control_single
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-ocata-common
-noha
.infra.config
+ - cluster.virtual-mcp-ocata-odl-router
-noha
parameters:
reclass:
storage:
parameters:
reclass:
storage:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/init.yml
similarity index 68%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/init.yml
index
980ea1b
..
6b2e625
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/init.yml
@@
-9,12
+9,12
@@
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
- - cluster.virtual-mcp-ocata-common.init_options
- - cluster.virtual-mcp-ocata-common.infra
- - cluster.virtual-mcp-ocata-odl-router.openstack
+ - cluster.virtual-mcp-ocata-common
-noha
.init_options
+ - cluster.virtual-mcp-ocata-common
-noha
.infra
+ - cluster.virtual-mcp-ocata-odl-router
-noha
.openstack
parameters:
_param:
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-odl-router.local
- cluster_name: virtual-mcp-ocata-odl-router
+ cluster_domain: virtual-mcp-ocata-odl-router
-noha
.local
+ cluster_name: virtual-mcp-ocata-odl-router
-noha
opendaylight_service_host: 172.16.10.111
opendaylight_service_host: 172.16.10.111
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/opendaylight/control.yml
similarity index 96%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/opendaylight/control.yml
index
f75cd33
..
2d1c889
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-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
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.opendaylight.server.single
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-ocata-odl-router
-noha
parameters:
_param:
linux_system_codename: xenial
parameters:
_param:
linux_system_codename: xenial
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml
similarity index 94%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml
index
f6f26be
..
972b5c6
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/compute.yml
@@
-7,8
+7,8
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_compute
+ - cluster.virtual-mcp-ocata-odl-router
-noha
parameters:
opendaylight:
client:
parameters:
opendaylight:
client:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml
similarity index 92%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml
index
a0ace96
..
912dc10
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/control.yml
@@
-8,8
+8,8
@@
---
classes:
- system.neutron.control.opendaylight.single
---
classes:
- system.neutron.control.opendaylight.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_control
+ - cluster.virtual-mcp-ocata-odl-router
-noha
parameters:
neutron:
server:
parameters:
neutron:
server:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml
similarity index 92%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml
index
231413a
..
e2c94bb
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/gateway.yml
@@
-7,9
+7,9
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_gateway
- system.neutron.gateway.opendaylight.single
- system.neutron.gateway.opendaylight.single
- - cluster.virtual-mcp-ocata-odl-router
+ - cluster.virtual-mcp-ocata-odl-router
-noha
parameters:
_param:
neutron_agents:
parameters:
_param:
neutron_agents:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml
similarity index 94%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml
index
5be63e5
..
f4b78c3
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router-noha/openstack/init.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/infra/config.yml
similarity index 89%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/infra/config.yml
index
ef07357
..
2d39b60
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/infra/config.yml
@@
-7,8
+7,8
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-ocata-common
-noha
.infra.config
+ - cluster.virtual-mcp-ocata-ovs-dpdk
-noha
parameters:
reclass:
storage:
parameters:
reclass:
storage:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/init.yml
similarity index 67%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/init.yml
index
588e8be
..
7dce401
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/init.yml
@@
-9,11
+9,11
@@
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
- - cluster.virtual-mcp-ocata-common.init_options
- - cluster.virtual-mcp-ocata-common.infra
- - cluster.virtual-mcp-ocata-ovs-dpdk.openstack
+ - cluster.virtual-mcp-ocata-common
-noha
.init_options
+ - cluster.virtual-mcp-ocata-common
-noha
.infra
+ - cluster.virtual-mcp-ocata-ovs-dpdk
-noha
.openstack
parameters:
_param:
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs-dpdk.local
- cluster_name: virtual-mcp-ocata-ovs-dpdk
+ cluster_domain: virtual-mcp-ocata-ovs-dpdk
-noha
.local
+ cluster_name: virtual-mcp-ocata-ovs-dpdk
-noha
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml
similarity index 91%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml
index
ba6577e
..
2727c7d
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/compute.yml
@@
-11,8
+11,8
@@
classes:
- system.linux.system.repo.mcp.extra
- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.dpdk
- system.linux.system.repo.mcp.extra
- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.dpdk
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_compute
+ - cluster.virtual-mcp-ocata-ovs-dpdk
-noha
parameters:
neutron:
compute:
parameters:
neutron:
compute:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml
similarity index 85%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml
index
780f664
..
1929b09
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/control.yml
@@
-8,8
+8,8
@@
---
classes:
- system.neutron.control.openvswitch.single
---
classes:
- system.neutron.control.openvswitch.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_control
+ - cluster.virtual-mcp-ocata-ovs-dpdk
-noha
parameters:
neutron:
server:
parameters:
neutron:
server:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml
similarity index 88%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml
index
4f215e8
..
d4f86c4
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/gateway.yml
@@
-7,9
+7,9
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_gateway
- service.neutron.gateway.single
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs-dpdk
+ - cluster.virtual-mcp-ocata-ovs-dpdk
-noha
parameters:
neutron:
gateway:
parameters:
neutron:
gateway:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml
similarity index 93%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml
index
c27f73b
..
953f021
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk-noha/openstack/init.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
parameters:
_param:
neutron_tenant_network_types: "flat,vlan"
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml
similarity index 83%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml
index
8505e35
..
4cca642
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/infra/config.yml
@@
-7,5
+7,5
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.infra.config
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-ocata-common
-noha
.infra.config
+ - cluster.virtual-mcp-ocata-ovs
-noha
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml
similarity index 69%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml
index
56e676b
..
bf9f0d0
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/init.yml
@@
-9,11
+9,11
@@
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
classes:
- system.linux.system.single
- cluster.all-mcp-ocata-common
- - cluster.virtual-mcp-ocata-common.init_options
- - cluster.virtual-mcp-ocata-common.infra
- - cluster.virtual-mcp-ocata-ovs.openstack
+ - cluster.virtual-mcp-ocata-common
-noha
.init_options
+ - cluster.virtual-mcp-ocata-common
-noha
.infra
+ - cluster.virtual-mcp-ocata-ovs
-noha
.openstack
parameters:
_param:
parameters:
_param:
- cluster_domain: virtual-mcp-ocata-ovs.local
- cluster_name: virtual-mcp-ocata-ovs
+ cluster_domain: virtual-mcp-ocata-ovs
-noha
.local
+ cluster_name: virtual-mcp-ocata-ovs
-noha
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml
similarity index 88%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml
index
c9fee88
..
c986ce8
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/compute.yml
@@
-7,8
+7,8
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_compute
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_compute
+ - cluster.virtual-mcp-ocata-ovs
-noha
parameters:
linux:
network:
parameters:
linux:
network:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml
similarity index 83%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml
index
17250c3
..
8df56bd
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/control.yml
@@
-8,5
+8,5
@@
---
classes:
- system.neutron.control.openvswitch.single
---
classes:
- system.neutron.control.openvswitch.single
- - cluster.virtual-mcp-ocata-common.openstack_control
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_control
+ - cluster.virtual-mcp-ocata-ovs
-noha
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml
similarity index 89%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml
index
50c0f6e
..
3751a07
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/gateway.yml
@@
-7,9
+7,9
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_gateway
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_gateway
- service.neutron.gateway.single
- service.neutron.gateway.single
- - cluster.virtual-mcp-ocata-ovs
+ - cluster.virtual-mcp-ocata-ovs
-noha
parameters:
linux:
network:
parameters:
linux:
network:
diff --git
a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml
similarity index 90%
rename from
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
rename to
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml
index
4b08394
..
dfaafb7
100644
(file)
--- a/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/
mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-noha/openstack/init.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-common.openstack_init
+ - cluster.virtual-mcp-ocata-common
-noha
.openstack_init
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
parameters:
_param:
neutron_tenant_network_types: "flat,vxlan"
diff --git
a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router-noha.local.yml
similarity index 84%
rename from
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
rename to
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router-noha.local.yml
index
f87897a
..
0aeed79
100644
(file)
--- a/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
+++ b/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router-noha.local.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-o
vs-dpdk
.infra.config
+ - cluster.virtual-mcp-ocata-o
dl-router-noha
.infra.config
parameters:
_param:
linux_system_codename: xenial
parameters:
_param:
linux_system_codename: xenial
@@
-15,4
+15,4
@@
parameters:
linux:
system:
name: cfg01
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-o
vs-dpdk
.local
+ domain: virtual-mcp-ocata-o
dl-router-noha
.local
diff --git
a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk-noha.local.yml
similarity index 84%
rename from
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
rename to
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk-noha.local.yml
index
2dc5e6a
..
f894633
100644
(file)
--- a/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
+++ b/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk-noha.local.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-o
dl-router
.infra.config
+ - cluster.virtual-mcp-ocata-o
vs-dpdk-noha
.infra.config
parameters:
_param:
linux_system_codename: xenial
parameters:
_param:
linux_system_codename: xenial
@@
-15,4
+15,4
@@
parameters:
linux:
system:
name: cfg01
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-o
dl-router
.local
+ domain: virtual-mcp-ocata-o
vs-dpdk-noha
.local
diff --git
a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-noha.local.yml
similarity index 85%
rename from
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
rename to
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-noha.local.yml
index
0be4100
..
a5e1bc1
100644
(file)
--- a/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
+++ b/
mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-noha.local.yml
@@
-7,7
+7,7
@@
##############################################################################
---
classes:
##############################################################################
---
classes:
- - cluster.virtual-mcp-ocata-ovs.infra.config
+ - cluster.virtual-mcp-ocata-ovs
-noha
.infra.config
parameters:
_param:
linux_system_codename: xenial
parameters:
_param:
linux_system_codename: xenial
@@
-15,4
+15,4
@@
parameters:
linux:
system:
name: cfg01
linux:
system:
name: cfg01
- domain: virtual-mcp-ocata-ovs.local
+ domain: virtual-mcp-ocata-ovs
-noha
.local