diff options
85 files changed, 100 insertions, 102 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 10703f3c0..c93adc657 100755 --- 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 0302464b6..55b433931 100644 --- 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 02ab5b2c3..538ff9b72 100644 --- 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 c9285abb7..d1662cac7 100644 --- 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 57793d934..37e4ad7ea 100644 --- 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 6f7d06c30..dc09cfbac 100644 --- 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 index 5b0d91381..5b0d91381 100644 --- 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 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 index e0f9a2a94..623eb34c1 100644 --- 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 index 55160bd6b..e20322a2e 100644 --- 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 index ce7fc8561..39ced154b 100644 --- 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 index d14f90582..d14f90582 100644 --- 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 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 index e8c2965f7..e8c2965f7 100644 --- 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 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 index e07e61139..47ef1f79f 100644 --- 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 index 687777b2c..687777b2c 100644 --- 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 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 index ce82807ce..ce82807ce 100644 --- 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 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 index deb4cd7e9..deb4cd7e9 100644 --- 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 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 index 7ed588d9b..7ed588d9b 100644 --- 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 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 index 731fe6ed6..731fe6ed6 100644 --- 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 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 index 49140f803..49140f803 100644 --- 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 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 index 88affb84a..88affb84a 100644 --- 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 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 index 84845658c..84845658c 100644 --- 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 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 index c52b5ed79..c52b5ed79 100644 --- 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 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 0d2c5a303..7733008b2 100644 --- 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 efcf1a4e7..7cc82dd31 100644 --- 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 d7bbadd75..01e4a6b99 100644 --- 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 5b842bba9..c51650ac8 100644 --- 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 4418b0fde..3c93972c7 100644 --- 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 210da2ad5..9f729f915 100644 --- 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 fc38aada6..f6e46d788 100644 --- 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 9a04c84d0..fa1ed1072 100644 --- 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 5757db3a6..78d6e8ec6 100644 --- 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 a516803fa..9549a63aa 100644 --- 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 fd4f7e8d1..32ebb05e9 100644 --- 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 149fff5ff..4a7e4cdcb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-common-ha.infra.config - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config_init diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 60278a5b3..9659c0b42 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-common-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack parameters: _param: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index f7a8fe352..e4506ca6a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml index 3ec33c39a..f4e71ed5b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-common-ha.infra.maas - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index e610dc930..98b182ce0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -8,7 +8,7 @@ --- classes: - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - system.neutron.compute.nfv.dpdk parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml index dddae33c4..9a98ba9c1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml @@ -8,7 +8,7 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: neutron: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml index e76b20ae6..fa65fbced 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-ovs-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml index 5e855ac4f..4ef7ffc96 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml index a01eda9a4..fb3312417 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-ovs-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml index 63ff2c87e..1fcde7ecd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml index d38cc0d0b..de41a81d3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra 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 c325246f4..e71f638b0 100644 --- 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 a15355b4c..044c05e0e 100644 --- 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 51bf6ae42..ea15224ab 100644 --- 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 9121299bd..692f74106 100644 --- 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 9ed3a80ea..79f297fe4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_compute + - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_init - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 790c6d9a3..6d120935a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -8,5 +8,5 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-common-ha.openstack_control - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index fae7c5bc3..91ae84cb3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-common-ha.openstack_database - cluster.baremetal-mcp-ocata-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml index 27fd40480..9ccbc08a9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_init + - cluster.baremetal-mcp-ocata-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 986422baf..3ce561374 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_message_queue + - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - cluster.baremetal-mcp-ocata-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index 9288e6f81..ff6246b75 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_proxy + - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index 6b2349e25..b8e857d8d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - cluster.baremetal-mcp-ocata-ovs-ha.infra 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 index 649b75c8c..649b75c8c 100644 --- 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 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 index 3c3d5260a..3c3d5260a 100644 --- 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 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 index 2385411b4..2385411b4 100644 --- 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 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 index 9540b9436..9540b9436 100644 --- 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 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 index 35c23fef7..35c23fef7 100644 --- 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 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 index 44c1407c5..98256745f 100644 --- 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 index 9822de7d3..9822de7d3 100644 --- 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 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 index cf35a2b20..cf35a2b20 100644 --- 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 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 index 4fd8e75c8..19dc9feb9 100644 --- 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 index 8501f032c..6a4ef9a48 100644 --- 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 index 58b461ef9..f4404a69b 100644 --- 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 index 34416f658..6b2ca8e86 100644 --- 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 index f904d64c3..ede9d4c5d 100644 --- 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 index 00725e9b0..47d11cd5d 100644 --- 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 index 906d79a67..cbf4e692e 100644 --- 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 index a346bacab..70dcd2f8a 100644 --- 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 index 528125b30..e6a7da4df 100644 --- 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 index fdb421918..0f53477eb 100644 --- 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 index b368a2c68..4dbaae829 100644 --- 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 index 07691fbf7..ec943a857 100644 --- 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 index 02d24caac..5445a07ea 100644 --- 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 index 788fd2ffd..dcf87774c 100644 --- 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 index 66d5e3fbd..d217a6978 100644 --- 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 index ea64da140..11e0d522e 100644 --- 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 index 070e48880..4e03c4b7e 100644 --- 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 index fe2f01281..0eec95cc4 100644 --- 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 index 5a4c444de..19126f89d 100644 --- 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 index 4b8e883cf..8828a9312 100644 --- 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 index bf68ab88d..4c435f873 100644 --- 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 index 514946b1c..7a715cfb8 100644 --- 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 |