diff options
44 files changed, 56 insertions, 35 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml index 467a45c22..a96e254df 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/init.yml @@ -50,8 +50,6 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} - single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index ce81f4272..3bd705c6c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -32,6 +32,9 @@ parameters: keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 deploy_nic: ${_param:opnfv_baremetal_primary_nic} + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml index fb5d1cf93..e8c2965f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml @@ -23,6 +23,9 @@ parameters: maas_db_password: opnfv_secret dns_server01: ${_param:opnfv_dns_server01} single_address: ${_param:infra_maas_node01_deploy_address} + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} maas: region: salt_master_ip: ${_param:infra_config_deploy_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml index aca416e94..0e973d495 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml @@ -36,6 +36,9 @@ parameters: keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 linux_system_codename: xenial + # {dhcp,single}_nic are not used, but referenced + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} glusterfs: client: volumes: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml index 0684bd826..2aa05f07d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_control.yml @@ -39,6 +39,8 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml index f6143e876..e082d2681 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_dashboard.yml @@ -11,6 +11,8 @@ classes: parameters: _param: horizon_site_branding: OpenStack Dashboard + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml index 2a25eab35..7ed588d9b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_database.yml @@ -35,6 +35,8 @@ parameters: cluster_node02_address: ${_param:openstack_database_node02_address} cluster_node03_hostname: dbs03 cluster_node03_address: ${_param:openstack_database_node03_address} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml index 04e45e832..88affb84a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_message_queue.yml @@ -23,6 +23,8 @@ parameters: cluster_node02_address: ${_param:openstack_message_queue_node02_address} cluster_node03_hostname: msg03 cluster_node03_address: ${_param:openstack_message_queue_node03_address} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml index 343937103..da3190815 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml @@ -30,6 +30,8 @@ parameters: mode: secure cluster_vip_address: ${_param:openstack_proxy_address} salt_minion_ca_host: cfg01.${_param:cluster_domain} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml index cffe04c6a..c52b5ed79 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_telemetry.yml @@ -28,6 +28,8 @@ parameters: cluster_node02_address: ${_param:openstack_telemetry_node02_address} cluster_node03_hostname: mdb03 cluster_node03_address: ${_param:openstack_telemetry_node03_address} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: 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 991e3f9f7..0d2c5a303 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,8 +8,8 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: reclass: storage: 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 2017aa4a3..efcf1a4e7 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,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.openstack - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-odl-ha.openstack parameters: _param: cluster_name: baremetal-mcp-ocata-odl-ha 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 344b19028..d7bbadd75 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,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.kvm + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: salt: control: 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 17e1e02ac..5b842bba9 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-odl-ha.infra - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml index 225c7850f..edb1a338f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml @@ -14,6 +14,8 @@ classes: parameters: _param: linux_system_codename: xenial + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml index d9b1541df..5ae972da9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha - cluster.baremetal-mcp-ocata-common.openstack_benchmark + - cluster.baremetal-mcp-ocata-odl-ha 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 5bc423e14..210da2ad5 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,8 +8,8 @@ --- classes: - system.neutron.control.opendaylight.cluster - - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml index 1d2cf4fbf..c60d7c46c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha - cluster.baremetal-mcp-ocata-common.openstack_dashboard + - cluster.baremetal-mcp-ocata-odl-ha 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 d85bbefdc..fc38aada6 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-odl-ha - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-odl-ha 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 76c3def28..5757db3a6 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-odl-ha - cluster.baremetal-mcp-ocata-common.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 08d0fe11a..7cb1c10c2 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,9 +7,9 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common.openstack_proxy - cluster.baremetal-mcp-ocata-odl-ha.infra - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard - - cluster.baremetal-mcp-ocata-common.openstack_proxy parameters: nginx: server: 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 58552effa..fd4f7e8d1 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-odl-ha.infra - cluster.baremetal-mcp-ocata-common.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 ce5d9ca27..7bd8c37f1 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,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-common.infra.config + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: reclass: storage: 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 c034ced9a..60278a5b3 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,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack parameters: _param: cluster_name: baremetal-mcp-ocata-ovs-dpdk-ha 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 488981268..f7a8fe352 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-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-common.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 9d7dab601..3ec33c39a 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-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml index b19345700..1c02ae4a2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha - cluster.baremetal-mcp-ocata-common.openstack_benchmark + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha 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 01e723f6a..dddae33c4 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,8 +8,8 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml index 62c30b23e..278bf148f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha - cluster.baremetal-mcp-ocata-common.openstack_dashboard + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha 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 861129a5c..e76b20ae6 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-ovs-dpdk-ha - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-ovs-dpdk-ha 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 0895094d5..a01eda9a4 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-ovs-dpdk-ha - cluster.baremetal-mcp-ocata-common.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 07f797188..07da7eb19 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,6 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard - - cluster.baremetal-mcp-ocata-common.openstack_proxy 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 17a324fa0..d38cc0d0b 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-ovs-dpdk-ha.infra - cluster.baremetal-mcp-ocata-common.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 5f5601f24..c325246f4 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-ovs-ha.infra - cluster.baremetal-mcp-ocata-common.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 cdfde5b4b..a15355b4c 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,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-ha.openstack - cluster.baremetal-mcp-ocata-common.infra + - cluster.baremetal-mcp-ocata-ovs-ha.openstack parameters: _param: cluster_name: baremetal-mcp-ocata-ovs-ha 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 ebe13172d..51bf6ae42 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-ovs-ha.infra - cluster.baremetal-mcp-ocata-common.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 ec078ed87..9121299bd 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-ovs-ha.infra - cluster.baremetal-mcp-ocata-common.infra.maas + - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml index b8bf1c7dd..783561ad5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-ha - cluster.baremetal-mcp-ocata-common.openstack_benchmark + - cluster.baremetal-mcp-ocata-ovs-ha 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 549cb52c6..790c6d9a3 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-ovs-ha.infra - cluster.baremetal-mcp-ocata-common.openstack_control + - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml index 24218f065..8dec9ed17 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-ha - cluster.baremetal-mcp-ocata-common.openstack_dashboard + - cluster.baremetal-mcp-ocata-ovs-ha 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 545980ae6..fae7c5bc3 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-ovs-ha - cluster.baremetal-mcp-ocata-common.openstack_database + - cluster.baremetal-mcp-ocata-ovs-ha 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 762e2ed4e..986422baf 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-ovs-ha - cluster.baremetal-mcp-ocata-common.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 aaefc6131..f2a9d893a 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,6 +7,6 @@ ############################################################################## --- classes: + - cluster.baremetal-mcp-ocata-common.openstack_proxy - cluster.baremetal-mcp-ocata-ovs-ha.infra - cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard - - cluster.baremetal-mcp-ocata-common.openstack_proxy 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 744d40f4e..6b2349e25 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-ovs-ha.infra - cluster.baremetal-mcp-ocata-common.openstack_telemetry + - cluster.baremetal-mcp-ocata-ovs-ha.infra |