diff options
author | 2017-12-11 09:59:24 +0000 | |
---|---|---|
committer | 2017-12-11 09:59:25 +0000 | |
commit | 9b94e9cdbaa76c39aabd7d6aa5befdce92a66a67 (patch) | |
tree | fc8310607caed40ff623ff4f0937cbd100eaa8e7 /mcp/reclass | |
parent | c976700c1e8702881f67f3306a67d56c9f78c327 (diff) | |
parent | 60eb5044f4236eced9dc5df4fb787359f166ee6d (diff) |
Merge "[baremetal] Update openstack version to pike"
Diffstat (limited to 'mcp/reclass')
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml | 12 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 25 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml) | 3 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control_init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml) | 1 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database_init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml) | 14 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml) | 1 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml) | 1 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/config.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml) | 6 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/maas.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml) | 7 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml) | 14 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml | 12 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml) | 6 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml) | 12 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml) | 15 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/config.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml) | 6 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/kvm.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/maas.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml | 17 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2) | 0 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml) | 2 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml (renamed from mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml | 11 | ||||
-rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml | 11 | ||||
m--------- | mcp/reclass/classes/system | 0 | ||||
-rw-r--r-- | mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml (renamed from mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml (renamed from mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml) | 4 | ||||
-rw-r--r-- | mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml (renamed from mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml) | 4 |
66 files changed, 167 insertions, 209 deletions
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 deleted file mode 100644 index 2adc5bd02..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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_pdf 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 deleted file mode 100644 index fa65fbced..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml deleted file mode 100644 index fb3312417..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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 deleted file mode 100644 index 1fcde7ecd..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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 deleted file mode 100644 index de41a81d3..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - 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/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml deleted file mode 100644 index 9973075aa..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - - cluster.baremetal-mcp-ocata-ovs-ha.openstack.compute_pdf - - cluster.baremetal-mcp-ocata-ovs-ha.infra -parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd - linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com 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 deleted file mode 100644 index b8e857d8d..000000000 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - - cluster.baremetal-mcp-ocata-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml index f2a4dbe43..2003aa08e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml @@ -97,7 +97,7 @@ parameters: # - system.kibana.client.single openstack_control_node01: classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_control_init + - cluster.baremetal-mcp-pike-common-ha.openstack_control_init params: linux_system_codename: xenial openstack_control_node02: @@ -108,7 +108,7 @@ parameters: linux_system_codename: xenial openstack_database_node01: classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_database_init + - cluster.baremetal-mcp-pike-common-ha.openstack_database_init params: linux_system_codename: xenial openstack_database_node02: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml index e20322a2e..e20322a2e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml index 035129dca..df94e284f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml @@ -7,8 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.linux.system.repo.glusterfs - service.keepalived.cluster.single - system.glusterfs.server.volume.glance @@ -23,7 +21,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-ha.infra.kvm_pdf + - cluster.baremetal-mcp-pike-common-ha.infra.kvm_pdf parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 index d14f90582..d14f90582 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/kvm_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml index e8c2965f7..e8c2965f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml index ee36ece23..b86049ade 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.extra - system.linux.system.repo.glusterfs - system.linux.storage.loopback - system.glusterfs.client.cluster @@ -18,7 +17,7 @@ classes: - system.cinder.volume.single - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - - cluster.baremetal-mcp-ocata-common-ha.openstack_compute_pdf + - cluster.baremetal-mcp-pike-common-ha.openstack_compute_pdf parameters: _param: cluster_vip_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index cad407f57..cad407f57 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml index ce82807ce..12fc7b07e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control.yml @@ -7,8 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.linux.system.repo.glusterfs - system.ceilometer.client - system.memcached.server.single diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control_init.yml index deb4cd7e9..deb4cd7e9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_control_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_control_init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml index 7ed588d9b..ba02305a1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database.yml @@ -8,7 +8,6 @@ --- classes: - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.galera.server.cluster - system.galera.server.database.aodh - system.galera.server.database.ceilometer diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database_init.yml index 731fe6ed6..731fe6ed6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_database_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_database_init.yml diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml index 49140f803..e2f6539c4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml @@ -9,7 +9,7 @@ parameters: _param: - openstack_version: ocata + openstack_version: pike openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address} openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address} @@ -195,6 +195,18 @@ parameters: # billometer_identity_host: ${_param:openstack_control_address} # billometer_identity_token: ${_param:keystone_service_token} linux: + system: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" + architectures: amd64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 network: host: prx: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml index 88affb84a..4228af235 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_message_queue.yml @@ -8,7 +8,6 @@ --- classes: - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.rabbitmq.server.cluster - system.rabbitmq.server.vhost.openstack parameters: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml index 031955606..30efa9f55 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_proxy.yml @@ -7,8 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.nginx.server.single - system.nginx.server.proxy.openstack_api - system.nginx.server.proxy.openstack_vnc diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml index c52b5ed79..1c1a3c760 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_telemetry.yml @@ -7,7 +7,6 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.mongodb.server.cluster - system.mongodb.server.database.ceilometer diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/config.yml index 7733008b2..d9f723a7c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/config.yml @@ -8,8 +8,8 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.baremetal-mcp-ocata-common-ha.infra.config - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.config + - cluster.baremetal-mcp-pike-odl-ha.infra parameters: reclass: storage: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml index 044c05e0e..014c57ffa 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/init.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra - - cluster.baremetal-mcp-ocata-ovs-ha.openstack + - cluster.baremetal-mcp-pike-common-ha.infra + - cluster.baremetal-mcp-pike-odl-ha.openstack parameters: _param: - cluster_name: baremetal-mcp-ocata-ovs-ha + cluster_name: baremetal-mcp-pike-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml index 01e4a6b99..6bcc72dc8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.kvm + - cluster.baremetal-mcp-pike-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-pike-odl-ha/infra/maas.yml index c51650ac8..f58e632c7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/maas.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.maas - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.maas + - cluster.baremetal-mcp-pike-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/init.yml index 474ee6d70..e0d15e607 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.baremetal-mcp-ocata-odl-ha.infra - - cluster.baremetal-mcp-ocata-odl-ha.openstack + - cluster.baremetal-mcp-pike-odl-ha.infra + - cluster.baremetal-mcp-pike-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml index edb1a338f..3bb4266ea 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/opendaylight/control.yml @@ -7,10 +7,8 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - system.opendaylight.server.single - - cluster.baremetal-mcp-ocata-odl-ha + - cluster.baremetal-mcp-pike-odl-ha parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute.yml index cec60a871..473b3ff48 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute.yml @@ -7,10 +7,9 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - - cluster.baremetal-mcp-ocata-odl-ha.openstack.compute_pdf - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_compute + - cluster.baremetal-mcp-pike-odl-ha.openstack.compute_pdf + - cluster.baremetal-mcp-pike-odl-ha.infra - system.neutron.gateway.opendaylight.single parameters: _param: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 index 7809bd8c8..7809bd8c8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml index 9f729f915..fd89a4fc2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/control.yml @@ -8,8 +8,8 @@ --- classes: - system.neutron.control.opendaylight.cluster - - cluster.baremetal-mcp-ocata-common-ha.openstack_control - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_control + - cluster.baremetal-mcp-pike-odl-ha.infra parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml index f6e46d788..18cc777a5 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/database.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_database - - cluster.baremetal-mcp-ocata-odl-ha + - cluster.baremetal-mcp-pike-common-ha.openstack_database + - cluster.baremetal-mcp-pike-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/init.yml index fa1ed1072..0859dc9f0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_init + - cluster.baremetal-mcp-pike-common-ha.openstack_init parameters: _param: # opendaylight options @@ -23,18 +23,6 @@ parameters: compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: ${_param:nova_cpu_pinning} linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 network: host: odl01: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml index e4506ca6a..ad0836577 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue + - cluster.baremetal-mcp-pike-odl-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml index 9549a63aa..1b329354a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/proxy.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_proxy + - cluster.baremetal-mcp-pike-odl-ha.infra parameters: nginx: server: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml index 78d6e8ec6..0eed90823 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/telemetry.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - - cluster.baremetal-mcp-ocata-odl-ha + - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry + - cluster.baremetal-mcp-pike-odl-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml new file mode 100644 index 000000000..3b7ba99e0 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.infra.config + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 index 5511ed774..5511ed774 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/config_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml index 9659c0b42..e3dd53629 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/init.yml @@ -7,11 +7,11 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack + - cluster.baremetal-mcp-pike-common-ha.infra + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack parameters: _param: - cluster_name: baremetal-mcp-ocata-ovs-dpdk-ha + cluster_name: baremetal-mcp-pike-ovs-dpdk-ha linux: system: service: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml new file mode 100644 index 000000000..bb2087d70 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/kvm.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.infra.kvm + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml new file mode 100644 index 000000000..fb55539f5 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.infra.maas + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/init.yml index 5f05c05b8..ab450e045 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml index 98b182ce0..59bbf3869 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml @@ -7,9 +7,8 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack - - cluster.baremetal-mcp-ocata-common-ha.openstack_compute - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_compute + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra - system.neutron.compute.nfv.dpdk parameters: neutron: @@ -22,13 +21,6 @@ parameters: libvirt_service: libvirtd libvirt_bin: /etc/default/libvirtd linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com network: interface: dpdk0: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml index 9a98ba9c1..a67546ce9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/control.yml @@ -8,8 +8,8 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common-ha.openstack_control - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_control + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml index 91ae84cb3..369c9ec76 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/database.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_database - - cluster.baremetal-mcp-ocata-ovs-ha + - cluster.baremetal-mcp-pike-common-ha.openstack_database + - cluster.baremetal-mcp-pike-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-pike-ovs-dpdk-ha/openstack/init.yml index 4ef7ffc96..7d85fda41 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_init + - cluster.baremetal-mcp-pike-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" @@ -22,16 +22,3 @@ parameters: compute_ovs_dpdk_socket_mem: "2048,2048" compute_ovs_dpdk_lcore_mask: "0x8" compute_ovs_memory_channels: "2" - linux: - system: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" - architectures: amd64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml index 3ce561374..a8b5d38e2 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_message_queue - - cluster.baremetal-mcp-ocata-ovs-ha + - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue + - cluster.baremetal-mcp-pike-ovs-dpdk-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml index ff6246b75..92bdfe0c9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/proxy.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_proxy - - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_proxy + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml index 32ebb05e9..cf71cd962 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_telemetry - - cluster.baremetal-mcp-ocata-odl-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry + - cluster.baremetal-mcp-pike-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-pike-ovs-ha/infra/config.yml index e71f638b0..1a55d7807 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/config.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.config - - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.config + - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml index 7cc82dd31..2f62c0165 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/init.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra - - cluster.baremetal-mcp-ocata-odl-ha.openstack + - cluster.baremetal-mcp-pike-common-ha.infra + - cluster.baremetal-mcp-pike-ovs-ha.openstack parameters: _param: - cluster_name: baremetal-mcp-ocata-odl-ha + cluster_name: baremetal-mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/kvm.yml index ea15224ab..b4c2a67ac 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/kvm.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.kvm - - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.kvm + - cluster.baremetal-mcp-pike-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-pike-ovs-ha/infra/maas.yml index 692f74106..4bb3d74f7 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/infra/maas.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.maas - - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-pike-common-ha.infra.maas + - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/init.yml index 1c2952456..12a3ea211 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.baremetal-mcp-ocata-ovs-ha.infra - - cluster.baremetal-mcp-ocata-ovs-ha.openstack + - cluster.baremetal-mcp-pike-ovs-ha.infra + - cluster.baremetal-mcp-pike-ovs-ha.openstack diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml new file mode 100644 index 000000000..5914f50be --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute.yml @@ -0,0 +1,17 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_compute + - cluster.baremetal-mcp-pike-ovs-ha.openstack.compute_pdf + - cluster.baremetal-mcp-pike-ovs-ha.infra +parameters: + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 index 7acb4b4c6..7acb4b4c6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml index 6d120935a..740f63288 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/control.yml @@ -8,5 +8,5 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.baremetal-mcp-ocata-common-ha.openstack_control - - cluster.baremetal-mcp-ocata-ovs-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_control + - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml new file mode 100644 index 000000000..e7d81e6e3 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/database.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_database + - cluster.baremetal-mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml index 9ccbc08a9..84ab1aa83 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.openstack_init + - cluster.baremetal-mcp-pike-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml index f4e71ed5b..8ae6c52f6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/message_queue.yml @@ -7,5 +7,5 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-common-ha.infra.maas - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra + - cluster.baremetal-mcp-pike-common-ha.openstack_message_queue + - cluster.baremetal-mcp-pike-ovs-ha diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml new file mode 100644 index 000000000..2664a0834 --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/proxy.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_proxy + - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml new file mode 100644 index 000000000..d0aed272d --- /dev/null +++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/telemetry.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.baremetal-mcp-pike-common-ha.openstack_telemetry + - cluster.baremetal-mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 2c7e4f3b9e1b7bb7e52139c34198f9629887caa +Subproject 0a17807f39aac95f9e0de8643f64e5116bdd1a1 diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml index ecd625fb0..fb067f038 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-odl-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-ha.infra.config + - cluster.baremetal-mcp-pike-odl-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: baremetal-mcp-ocata-ovs-ha.local + domain: baremetal-mcp-pike-odl-ha.local diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml index 8c1653bd6..df38d09b8 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-dpdk-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config + - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: baremetal-mcp-ocata-ovs-dpdk-ha.local + domain: baremetal-mcp-pike-ovs-dpdk-ha.local diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml index e55e94730..dc9c8c748 100644 --- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-pike-ovs-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.baremetal-mcp-ocata-odl-ha.infra.config + - cluster.baremetal-mcp-pike-ovs-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: baremetal-mcp-ocata-odl-ha.local + domain: baremetal-mcp-pike-ovs-ha.local |