From bf341b7e0d7e423044827f379e4b180e9dc897a1 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 7 Jun 2018 17:19:27 +0400 Subject: [PATCH] [ha] Update OpenStack version to Queens * make cluster names version-agnostic * switch to mirror.mirantis.com * system reclass update Change-Id: I96394b3c9d8d38321289af8e3a4e8bbc5dd7a408 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 | 2 +- mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 | 2 +- mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 +- mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 | 2 +- mcp/reclass/classes/cluster/.gitignore | 32 +++++++++++----------- .../include/lab_proxy_pdf.yml.j2 | 0 .../include/maas_proxy.yml | 0 .../infra/config.yml | 6 ++-- .../infra/init.yml.j2 | 4 +-- .../infra/kvm.yml | 6 ++-- .../infra/kvm_pdf.yml.j2 | 0 .../infra/maas.yml | 4 +-- .../infra/maas_pdf.yml.j2 | 0 .../openstack_compute.yml | 8 +++--- .../openstack_compute_pdf.yml.j2 | 0 .../openstack_control.yml.j2 | 8 +++--- .../openstack_control_init.yml | 17 ++++++++++++ .../openstack_database.yml | 2 +- .../openstack_database_init.yml | 0 .../openstack_init.yml.j2 | 5 +++- .../openstack_interface_vcp_biport.yml.j2 | 4 +-- .../openstack_interface_vcp_triport.yml.j2 | 4 +-- .../openstack_message_queue.yml | 2 +- .../openstack_proxy.yml.j2 | 2 +- .../openstack_telemetry.yml | 2 +- .../infra/config.yml | 4 +-- .../{mcp-pike-ovn-ha => mcp-odl-ha}/infra/init.yml | 6 ++-- .../infra/init_vcp.yml.j2 | 2 +- .../infra/kvm.yml.j2 | 4 +-- .../infra/maas.yml.j2 | 4 +-- .../{mcp-pike-ovn-ha => mcp-odl-ha}/init.yml | 4 +-- .../opendaylight/control.yml.j2 | 4 +-- .../openstack/compute.yml | 6 ++-- .../openstack/compute_pdf.yml.j2 | 0 .../openstack/control.yml | 6 ++-- .../cluster/mcp-odl-ha/openstack/database.yml | 12 ++++++++ .../openstack/init.yml.j2 | 2 +- .../cluster/mcp-odl-ha/openstack/message_queue.yml | 12 ++++++++ .../openstack/proxy.yml | 6 ++-- .../cluster/mcp-odl-ha/openstack/telemetry.yml | 12 ++++++++ .../infra/config.yml | 4 +-- .../{mcp-pike-ovs-ha => mcp-ovn-ha}/infra/init.yml | 6 ++-- .../infra/init_vcp.yml.j2 | 2 +- .../infra/kvm.yml.j2 | 4 +-- .../classes/cluster/mcp-ovn-ha/infra/maas.yml | 11 ++++++++ .../{mcp-pike-odl-ha => mcp-ovn-ha}/init.yml | 4 +-- .../openstack/compute.yml | 6 ++-- .../openstack/compute_pdf.yml.j2 | 0 .../openstack/control.yml | 6 ++-- .../cluster/mcp-ovn-ha/openstack/database.yml | 12 ++++++++ .../openstack/init.yml | 2 +- .../cluster/mcp-ovn-ha/openstack/message_queue.yml | 12 ++++++++ .../init.yml => mcp-ovn-ha/openstack/proxy.yml} | 8 ++---- .../cluster/mcp-ovn-ha/openstack/telemetry.yml | 12 ++++++++ .../infra/config.yml | 4 +-- .../infra/init.yml | 6 ++-- .../infra/init_vcp.yml.j2 | 2 +- .../infra/kvm.yml.j2 | 4 +-- .../classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml | 11 ++++++++ .../{mcp-pike-ovs-ha => mcp-ovs-dpdk-ha}/init.yml | 4 +-- .../openstack/compute.yml | 6 ++-- .../openstack/compute_pdf.yml.j2 | 0 .../openstack/control.yml | 6 ++-- .../cluster/mcp-ovs-dpdk-ha/openstack/database.yml | 12 ++++++++ .../openstack/init.yml | 2 +- .../mcp-ovs-dpdk-ha/openstack/message_queue.yml | 12 ++++++++ .../cluster/mcp-ovs-dpdk-ha/openstack/proxy.yml | 12 ++++++++ .../mcp-ovs-dpdk-ha/openstack/telemetry.yml | 12 ++++++++ .../infra/config.yml | 4 +-- .../classes/cluster/mcp-ovs-ha/infra/init.yml | 14 ++++++++++ .../infra/init_vcp.yml.j2 | 2 +- .../infra/kvm.yml.j2 | 4 +-- .../classes/cluster/mcp-ovs-ha/infra/maas.yml | 11 ++++++++ .../{mcp-pike-ovs-dpdk-ha => mcp-ovs-ha}/init.yml | 4 +-- .../openstack/compute.yml | 6 ++-- .../openstack/compute_pdf.yml.j2 | 0 .../openstack/control.yml | 6 ++-- .../cluster/mcp-ovs-ha/openstack/database.yml | 12 ++++++++ .../openstack/init.yml | 2 +- .../cluster/mcp-ovs-ha/openstack/message_queue.yml | 12 ++++++++ .../classes/cluster/mcp-ovs-ha/openstack/proxy.yml | 12 ++++++++ .../cluster/mcp-ovs-ha/openstack/telemetry.yml | 12 ++++++++ .../cluster/mcp-pike-odl-ha/openstack/database.yml | 12 -------- .../mcp-pike-odl-ha/openstack/message_queue.yml | 12 -------- .../mcp-pike-odl-ha/openstack/telemetry.yml | 12 -------- .../classes/cluster/mcp-pike-ovn-ha/infra/maas.yml | 11 -------- .../cluster/mcp-pike-ovn-ha/openstack/database.yml | 12 -------- .../mcp-pike-ovn-ha/openstack/message_queue.yml | 12 -------- .../cluster/mcp-pike-ovn-ha/openstack/proxy.yml | 12 -------- .../mcp-pike-ovn-ha/openstack/telemetry.yml | 12 -------- .../cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml | 11 -------- .../mcp-pike-ovs-dpdk-ha/openstack/database.yml | 12 -------- .../openstack/message_queue.yml | 12 -------- .../mcp-pike-ovs-dpdk-ha/openstack/proxy.yml | 12 -------- .../mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml | 12 -------- .../classes/cluster/mcp-pike-ovs-ha/infra/maas.yml | 11 -------- .../cluster/mcp-pike-ovs-ha/openstack/database.yml | 12 -------- .../mcp-pike-ovs-ha/openstack/message_queue.yml | 12 -------- .../cluster/mcp-pike-ovs-ha/openstack/proxy.yml | 12 -------- .../mcp-pike-ovs-ha/openstack/telemetry.yml | 12 -------- mcp/reclass/classes/system | 2 +- ...odl-ha.local.yml => cfg01.mcp-odl-ha.local.yml} | 4 +-- ...ovn-ha.local.yml => cfg01.mcp-ovn-ha.local.yml} | 4 +-- ...a.local.yml => cfg01.mcp-ovs-dpdk-ha.local.yml} | 4 +-- ...ovs-ha.local.yml => cfg01.mcp-ovs-ha.local.yml} | 4 +-- 105 files changed, 366 insertions(+), 346 deletions(-) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/include/lab_proxy_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/include/maas_proxy.yml (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/config.yml (97%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/init.yml.j2 (97%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/kvm.yml (97%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/kvm_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/maas.yml (96%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/infra/maas_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_compute.yml (92%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_compute_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_control.yml.j2 (97%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_control_init.yml (68%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_database.yml (97%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_database_init.yml (100%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_init.yml.j2 (99%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_interface_vcp_biport.yml.j2 (90%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_interface_vcp_triport.yml.j2 (93%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_message_queue.yml (95%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_proxy.yml.j2 (98%) rename mcp/reclass/classes/cluster/{mcp-pike-common-ha => mcp-common-ha}/openstack_telemetry.yml (98%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/infra/config.yml (91%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-odl-ha}/infra/init.yml (81%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-odl-ha}/infra/init_vcp.yml.j2 (93%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/infra/kvm.yml.j2 (93%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/infra/maas.yml.j2 (90%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-odl-ha}/init.yml (87%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/opendaylight/control.yml.j2 (91%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/openstack/compute.yml (82%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/openstack/compute_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/openstack/control.yml (84%) create mode 100644 mcp/reclass/classes/cluster/mcp-odl-ha/openstack/database.yml rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/openstack/init.yml.j2 (95%) create mode 100644 mcp/reclass/classes/cluster/mcp-odl-ha/openstack/message_queue.yml rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-odl-ha}/openstack/proxy.yml (85%) create mode 100644 mcp/reclass/classes/cluster/mcp-odl-ha/openstack/telemetry.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovn-ha}/infra/config.yml (86%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovn-ha}/infra/init.yml (81%) rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-ovn-ha}/infra/init_vcp.yml.j2 (93%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovn-ha}/infra/kvm.yml.j2 (88%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha => mcp-ovn-ha}/init.yml (87%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovn-ha}/openstack/compute.yml (81%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovn-ha}/openstack/compute_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovn-ha}/openstack/control.yml (78%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovn-ha}/openstack/init.yml (92%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml rename mcp/reclass/classes/cluster/{mcp-pike-odl-ha/infra/init.yml => mcp-ovn-ha/openstack/proxy.yml} (77%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/infra/config.yml (86%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/infra/init.yml (82%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovs-dpdk-ha}/infra/init_vcp.yml.j2 (93%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovs-dpdk-ha}/infra/kvm.yml.j2 (88%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovs-dpdk-ha}/init.yml (87%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/openstack/compute.yml (86%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/openstack/compute_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/openstack/control.yml (80%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/database.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-dpdk-ha}/openstack/init.yml (92%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/message_queue.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/proxy.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/telemetry.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovs-ha}/infra/config.yml (86%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-ha}/infra/init_vcp.yml.j2 (92%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-ha}/infra/kvm.yml.j2 (87%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovs-dpdk-ha => mcp-ovs-ha}/init.yml (85%) rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovs-ha}/openstack/compute.yml (81%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovs-ha}/openstack/compute_pdf.yml.j2 (100%) rename mcp/reclass/classes/cluster/{mcp-pike-ovs-ha => mcp-ovs-ha}/openstack/control.yml (78%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml rename mcp/reclass/classes/cluster/{mcp-pike-ovn-ha => mcp-ovs-ha}/openstack/init.yml (92%) create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml rename mcp/reclass/nodes/{cfg01.mcp-pike-odl-ha.local.yml => cfg01.mcp-odl-ha.local.yml} (88%) rename mcp/reclass/nodes/{cfg01.mcp-pike-ovn-ha.local.yml => cfg01.mcp-ovn-ha.local.yml} (88%) rename mcp/reclass/nodes/{cfg01.mcp-pike-ovs-dpdk-ha.local.yml => cfg01.mcp-ovs-dpdk-ha.local.yml} (87%) rename mcp/reclass/nodes/{cfg01.mcp-pike-ovs-ha.local.yml => cfg01.mcp-ovs-ha.local.yml} (88%) diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 index 2c4a5f197..a6a641c63 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2 @@ -14,7 +14,7 @@ {%- endfor %} --- cluster: - domain: mcp-pike-ovs-ha.local + domain: mcp-ovs-ha.local states: {%- if cluster.has_baremetal_nodes %} - maas diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 index 96db11739..f43433014 100644 --- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 +++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 @@ -14,7 +14,7 @@ {%- endfor %} --- cluster: - domain: mcp-pike-ovs-dpdk-ha.local + domain: mcp-ovs-dpdk-ha.local states: {%- if cluster.has_baremetal_nodes %} - maas diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index 0bd3a1307..9018adb87 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 @@ -14,7 +14,7 @@ {%- endfor %} --- cluster: - domain: mcp-pike-odl-ha.local + domain: mcp-odl-ha.local states: {%- if cluster.has_baremetal_nodes %} - maas diff --git a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 index 8b7fda0c4..2f6bd86dc 100644 --- a/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-ovn-nofeature-ha.yaml.j2 @@ -14,7 +14,7 @@ {%- endfor %} --- cluster: - domain: mcp-pike-ovn-ha.local + domain: mcp-ovn-ha.local states: {%- if cluster.has_baremetal_nodes %} - maas diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index a37a68691..bc812c229 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -1,19 +1,19 @@ **/*_pdf.yml -mcp-pike-common-ha/infra/init.yml -mcp-pike-common-ha/openstack_control.yml -mcp-pike-common-ha/openstack_init.yml -mcp-pike-common-ha/openstack_interface_vcp_biport.yml -mcp-pike-common-ha/openstack_interface_vcp_triport.yml -mcp-pike-common-ha/openstack_proxy.yml -mcp-pike-ovs-ha/infra/init_vcp.yml -mcp-pike-ovs-ha/infra/kvm.yml -mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml -mcp-pike-ovs-dpdk-ha/infra/kvm.yml -mcp-pike-odl-ha/infra/init_vcp.yml -mcp-pike-odl-ha/infra/kvm.yml -mcp-pike-ovn-ha/infra/init_vcp.yml -mcp-pike-ovn-ha/infra/kvm.yml -mcp-pike-odl-ha/opendaylight/control.yml -mcp-pike-odl-ha/openstack/init.yml +mcp-common-ha/infra/init.yml +mcp-common-ha/openstack_control.yml +mcp-common-ha/openstack_init.yml +mcp-common-ha/openstack_interface_vcp_biport.yml +mcp-common-ha/openstack_interface_vcp_triport.yml +mcp-common-ha/openstack_proxy.yml +mcp-ovs-ha/infra/init_vcp.yml +mcp-ovs-ha/infra/kvm.yml +mcp-ovs-dpdk-ha/infra/init_vcp.yml +mcp-ovs-dpdk-ha/infra/kvm.yml +mcp-odl-ha/infra/init_vcp.yml +mcp-odl-ha/infra/kvm.yml +mcp-ovn-ha/infra/init_vcp.yml +mcp-ovn-ha/infra/kvm.yml +mcp-odl-ha/opendaylight/control.yml +mcp-odl-ha/openstack/init.yml mcp-odl-noha/infra/config.yml mcp-odl-noha/openstack/compute.yml diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/include/lab_proxy_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/include/lab_proxy_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml b/mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/include/maas_proxy.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/include/maas_proxy.yml diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml similarity index 97% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml index 525abbea7..f626ecea4 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/config.yml @@ -25,7 +25,7 @@ classes: # - system.reclass.storage.system.stacklight_monitor_cluster # - system.reclass.storage.system.stacklight_telemetry_cluster - system.reclass.storage.system.infra_maas_single - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.include.lab_proxy_pdf parameters: _param: salt_master_base_environment: prd @@ -123,7 +123,7 @@ parameters: # - system.kibana.client.single openstack_control_node01: classes: - - cluster.mcp-pike-common-ha.openstack_control_init + - cluster.mcp-common-ha.openstack_control_init params: linux_system_codename: xenial # NOTE: When VCP is present, external_address is not used @@ -138,7 +138,7 @@ parameters: external_address: ${_param:openstack_proxy_node02_address} openstack_database_node01: classes: - - cluster.mcp-pike-common-ha.openstack_database_init + - cluster.mcp-common-ha.openstack_database_init params: linux_system_codename: xenial openstack_database_node02: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 similarity index 97% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 index 21639e3bc..d4927428f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/init.yml.j2 @@ -9,8 +9,8 @@ classes: - system.linux.system.single - cluster.all-mcp-arch-common - # - cluster.mcp-pike-common-ha.stacklight - # - cluster.mcp-pike-common-ha.stacklight.client + # - cluster.mcp-common-ha.stacklight + # - cluster.mcp-common-ha.stacklight.client parameters: _param: apt_mk_version: nightly diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml similarity index 97% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml index df2304521..868f324f6 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm.yml @@ -21,9 +21,9 @@ classes: # - system.salt.control.cluster.stacklight_server_cluster # - system.salt.control.cluster.stacklight_log_cluster # - system.salt.control.cluster.stacklight_telemetry_cluster - - cluster.mcp-pike-common-ha.infra.kvm_pdf - - cluster.mcp-pike-common-ha.include.maas_proxy - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.infra.kvm_pdf + - cluster.mcp-common-ha.include.maas_proxy + - cluster.mcp-common-ha.include.lab_proxy_pdf parameters: _param: linux_system_codename: xenial diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/kvm_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml similarity index 96% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml index 793a7efa5..8c8f4f659 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas.yml @@ -9,8 +9,8 @@ classes: - system.maas.region.single - service.maas.cluster.single - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf - - cluster.mcp-pike-common-ha.infra.maas_pdf + - cluster.mcp-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.infra.maas_pdf parameters: _param: dhcp_interface: ${_param:opnfv_fn_vm_primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/infra/maas_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/infra/maas_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml similarity index 92% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index c9bba93f2..c793f9759 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - system.linux.system.repo.glusterfs - system.glusterfs.client.cluster - system.nova.compute.cluster @@ -17,9 +17,9 @@ classes: - system.cinder.volume.backend.lvm - system.ceilometer.agent.cluster - system.ceilometer.agent.polling.default - - cluster.mcp-pike-common-ha.openstack_compute_pdf - - cluster.mcp-pike-common-ha.include.maas_proxy - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.openstack_compute_pdf + - cluster.mcp-common-ha.include.maas_proxy + - cluster.mcp-common-ha.include.lab_proxy_pdf parameters: _param: cluster_vip_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 similarity index 97% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index 599c48e80..ebec944da 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - system.linux.system.repo.glusterfs - system.ceilometer.client - system.memcached.server.single @@ -41,9 +41,9 @@ classes: # - system.salt.control.cluster.stacklight_server_cluster # - system.salt.control.cluster.stacklight_log_cluster # - system.salt.control.cluster.stacklight_telemetry_cluster - - cluster.mcp-pike-common-ha.infra.kvm_pdf - - cluster.mcp-pike-common-ha.include.maas_proxy - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.infra.kvm_pdf + - cluster.mcp-common-ha.include.maas_proxy + - cluster.mcp-common-ha.include.lab_proxy_pdf {%- endif %} parameters: _param: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml similarity index 68% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml index d34892282..0664c5399 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml @@ -16,3 +16,20 @@ classes: - system.keystone.client.service.designate - system.keystone.client.service.gnocchi - system.keystone.client.service.panko + - system.keystone.client.v3.service.keystone +parameters: + keystone: + client: + enabled: true + resources: + v3: + enabled: true + server: + identity: + admin: + api_version: 3 + admin_identity: + admin: + api_version: '' + user_domain_name: 'Default' + project_domain_name: 'Default' diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml similarity index 97% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml index e65fc24a2..89c485e0f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - system.galera.server.cluster - system.galera.server.database.aodh - system.galera.server.database.ceilometer diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_database_init.yml similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_database_init.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_database_init.yml diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 similarity index 99% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index 796bbb138..00f24087e 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -9,7 +9,7 @@ parameters: _param: - openstack_version: pike + openstack_version: queens # openstack service addresses {%- if conf.MCP_VCP %} @@ -264,6 +264,9 @@ parameters: net.ipv4.tcp_congestion_control: yeah net.ipv4.tcp_slow_start_after_idle: 0 net.ipv4.tcp_fin_timeout: 30 + package: + python-tornado: + version: latest network: host: {%- if conf.MCP_VCP %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 similarity index 90% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 index cc92e5df9..18576b257 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_biport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_biport.yml.j2 @@ -8,8 +8,8 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-common-ha.include.maas_proxy - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.include.maas_proxy + - cluster.mcp-common-ha.include.lab_proxy_pdf parameters: _param: dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 similarity index 93% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 index 7fef8ae9f..2cd74992a 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_interface_vcp_triport.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_interface_vcp_triport.yml.j2 @@ -8,8 +8,8 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-common-ha.include.maas_proxy - - cluster.mcp-pike-common-ha.include.lab_proxy_pdf + - cluster.mcp-common-ha.include.maas_proxy + - cluster.mcp-common-ha.include.lab_proxy_pdf parameters: _param: dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_message_queue.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml similarity index 95% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_message_queue.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml index be6c5a311..855e63267 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_message_queue.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_message_queue.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - system.rabbitmq.server.cluster - system.rabbitmq.server.vhost.openstack parameters: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 similarity index 98% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 index 63a5d3af9..34ec10664 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - system.nginx.server.single - system.nginx.server.proxy.openstack_api - system.nginx.server.proxy.openstack_vnc diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml similarity index 98% rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml rename to mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml index bf0dc0b41..b7bb83b35 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.mirror.v1.openstack - service.redis.server.single - system.ceilometer.server.cluster - system.ceilometer.server.coordination.redis diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/config.yml similarity index 91% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/infra/config.yml index b812dea89..58e4cd09c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/config.yml @@ -8,8 +8,8 @@ --- classes: - system.reclass.storage.system.opendaylight_control_single - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-common-ha.infra.config + - cluster.mcp-odl-ha.infra - cluster.all-mcp-arch-common.infra.config_pdf parameters: reclass: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/init.yml similarity index 81% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/infra/init.yml index 5c7438ab4..67d8c5654 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/init.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-ovn-ha.openstack + - cluster.mcp-common-ha.infra + - cluster.mcp-odl-ha.openstack parameters: _param: - cluster_name: mcp-pike-ovn-ha + cluster_name: mcp-odl-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/init_vcp.yml.j2 similarity index 93% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init_vcp.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/infra/init_vcp.yml.j2 index 46acb7d2d..42cf4083e 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/init_vcp.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/init_vcp.yml.j2 @@ -8,5 +8,5 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-odl-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 similarity index 93% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 index 5fc4776d9..ab0da39b3 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 @@ -9,8 +9,8 @@ {%- if conf.MCP_VCP %} # NOTE(armband): we don't want to pull in salt.control for novcp classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-common-ha.infra.kvm + - cluster.mcp-odl-ha.infra parameters: salt: control: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 similarity index 90% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 index 153b493ce..30d712634 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/maas.yml.j2 @@ -13,8 +13,8 @@ {%- endfor %} --- classes: - - cluster.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-common-ha.infra.maas + - cluster.mcp-odl-ha.infra {%- if 'aarch64' not in cluster_arch %} parameters: _param: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/init.yml similarity index 87% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/init.yml index 69e8033c1..4e740d700 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.mcp-pike-ovn-ha.infra - - cluster.mcp-pike-ovn-ha.openstack + - cluster.mcp-odl-ha.infra + - cluster.mcp-odl-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 similarity index 91% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 index a5db82387..a6027e08a 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 @@ -8,9 +8,9 @@ --- classes: - service.opendaylight.server.single - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_interface_vcp_biport {%- if conf.MCP_VCP %} - - cluster.mcp-pike-odl-ha + - cluster.mcp-odl-ha {%- endif %} parameters: _param: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml similarity index 82% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml index 6c3e0d04c..992d1c8bf 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute.yml @@ -8,9 +8,9 @@ --- classes: - service.neutron.gateway.opendaylight.single - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-odl-ha.openstack.compute_pdf - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-common-ha.openstack_compute + - cluster.mcp-odl-ha.openstack.compute_pdf + - cluster.mcp-odl-ha.infra parameters: neutron: gateway: diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml similarity index 84% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml index e907e3d4c..547b61e0f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/control.yml @@ -8,9 +8,9 @@ --- classes: - system.neutron.control.opendaylight.cluster - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_control - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_control + - cluster.mcp-odl-ha.infra parameters: keystone: server: diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/database.yml new file mode 100644 index 000000000..c14f3853e --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/database.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_database + - cluster.mcp-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 similarity index 95% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 rename to mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 index 5a3b36fb1..43779e927 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_init + - cluster.mcp-common-ha.openstack_init parameters: _param: # opendaylight options diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/message_queue.yml new file mode 100644 index 000000000..c44cb22b2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/message_queue.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_message_queue + - cluster.mcp-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml similarity index 85% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml rename to mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml index 3c6b3a2cf..f0d4ecc37 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/proxy.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport - - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-odl-ha.infra.init_vcp + - cluster.mcp-common-ha.openstack_interface_vcp_triport + - cluster.mcp-common-ha.openstack_proxy + - cluster.mcp-odl-ha.infra.init_vcp parameters: nginx: server: diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/telemetry.yml new file mode 100644 index 000000000..52469b09a --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/telemetry.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_telemetry + - cluster.mcp-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/config.yml similarity index 86% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/infra/config.yml index ca7491a02..6cfca4f78 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/config.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-common-ha.infra.config + - cluster.mcp-ovn-ha.infra - cluster.all-mcp-arch-common.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init.yml similarity index 81% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init.yml index c0c873c00..198e460de 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init.yml @@ -7,8 +7,8 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-ovs-ha.openstack + - cluster.mcp-common-ha.infra + - cluster.mcp-ovn-ha.openstack parameters: _param: - cluster_name: mcp-pike-ovs-ha + cluster_name: mcp-ovn-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init_vcp.yml.j2 similarity index 93% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init_vcp.yml.j2 index 385326561..d62335703 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/init_vcp.yml.j2 @@ -8,5 +8,5 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-odl-ha.infra + - cluster.mcp-ovn-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/kvm.yml.j2 similarity index 88% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovn-ha/infra/kvm.yml.j2 index 0d49e5d10..1e6ed8554 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/kvm.yml.j2 @@ -9,6 +9,6 @@ {%- if conf.MCP_VCP %} # NOTE(armband): we don't want to pull in salt.control for novcp classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-common-ha.infra.kvm + - cluster.mcp-ovn-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml new file mode 100644 index 000000000..72a451652 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.infra.maas + - cluster.mcp-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/init.yml similarity index 87% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/init.yml index 80942c27f..a8cb4d8f8 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.mcp-pike-odl-ha.infra - - cluster.mcp-pike-odl-ha.openstack + - cluster.mcp-ovn-ha.infra + - cluster.mcp-ovn-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml similarity index 81% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml index fa815e8be..7afb40e52 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-ovs-ha.openstack.compute_pdf - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-common-ha.openstack_compute + - cluster.mcp-ovn-ha.openstack.compute_pdf + - cluster.mcp-ovn-ha.infra parameters: nova: compute: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml similarity index 78% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml index 96ea48ea2..811957600 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml @@ -8,6 +8,6 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_control - - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_control + - cluster.mcp-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml new file mode 100644 index 000000000..b8e441a36 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/database.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_database + - cluster.mcp-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml similarity index 92% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml index 02cd14adb..9dbfd59a1 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_init + - cluster.mcp-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml new file mode 100644 index 000000000..de0561d31 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/message_queue.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_message_queue + - cluster.mcp-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml similarity index 77% rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml rename to mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml index 419c05947..95b78758c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/proxy.yml @@ -7,8 +7,6 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-odl-ha.openstack -parameters: - _param: - cluster_name: mcp-pike-odl-ha + - cluster.mcp-common-ha.openstack_interface_vcp_triport + - cluster.mcp-common-ha.openstack_proxy + - cluster.mcp-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml new file mode 100644 index 000000000..eb7910faa --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/telemetry.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_telemetry + - cluster.mcp-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml similarity index 86% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml index 0b0632609..6c14d916a 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/config.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-ovs-dpdk-ha.infra + - cluster.mcp-common-ha.infra.config + - cluster.mcp-ovs-dpdk-ha.infra - cluster.all-mcp-arch-common.infra.config_dpdk_pdf diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml similarity index 82% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml index 5b49f2572..b3745b524 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init.yml @@ -7,11 +7,11 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-ovs-dpdk-ha.openstack + - cluster.mcp-common-ha.infra + - cluster.mcp-ovs-dpdk-ha.openstack parameters: _param: - cluster_name: mcp-pike-ovs-dpdk-ha + cluster_name: mcp-ovs-dpdk-ha linux: system: service: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 similarity index 93% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 index 74023ce14..f1636affe 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/init_vcp.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/init_vcp.yml.j2 @@ -8,5 +8,5 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-ovs-dpdk-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 similarity index 88% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 index 4a2355bf1..54c3a94a9 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/kvm.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/kvm.yml.j2 @@ -9,6 +9,6 @@ {%- if conf.MCP_VCP %} # NOTE(armband): we don't want to pull in salt.control for novcp classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-common-ha.infra.kvm + - cluster.mcp-ovs-dpdk-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml new file mode 100644 index 000000000..f3d605494 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.infra.maas + - cluster.mcp-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/init.yml similarity index 87% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/init.yml index a603c8450..e32a7cfea 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.mcp-pike-ovs-ha.infra - - cluster.mcp-pike-ovs-ha.openstack + - cluster.mcp-ovs-dpdk-ha.infra + - cluster.mcp-ovs-dpdk-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml similarity index 86% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml index d121c0807..106a2a7ac 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-ovs-dpdk-ha.infra - - cluster.mcp-pike-ovs-dpdk-ha.openstack.compute_pdf + - cluster.mcp-common-ha.openstack_compute + - cluster.mcp-ovs-dpdk-ha.infra + - cluster.mcp-ovs-dpdk-ha.openstack.compute_pdf - system.neutron.compute.nfv.dpdk parameters: neutron: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/control.yml similarity index 80% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/control.yml index e0423c33b..fdcec3541 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/control.yml @@ -8,9 +8,9 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_control - - cluster.mcp-pike-ovs-dpdk-ha.infra + - cluster.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_control + - cluster.mcp-ovs-dpdk-ha.infra parameters: neutron: server: diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/database.yml new file mode 100644 index 000000000..0402a6fb4 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/database.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_database + - cluster.mcp-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/init.yml similarity index 92% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml rename to mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/init.yml index 1f8ff4b9e..23921fa9d 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_init + - cluster.mcp-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/message_queue.yml new file mode 100644 index 000000000..67107953f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/message_queue.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_message_queue + - cluster.mcp-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/proxy.yml new file mode 100644 index 000000000..7da362666 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/proxy.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_triport + - cluster.mcp-common-ha.openstack_proxy + - cluster.mcp-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/telemetry.yml new file mode 100644 index 000000000..1c5406ea6 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-ha/openstack/telemetry.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_telemetry + - cluster.mcp-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/config.yml similarity index 86% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml rename to mcp/reclass/classes/cluster/mcp-ovs-ha/infra/config.yml index cab196d12..8e5551d48 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/config.yml @@ -7,6 +7,6 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.infra.config - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-common-ha.infra.config + - cluster.mcp-ovs-ha.infra - cluster.all-mcp-arch-common.infra.config_pdf diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init.yml new file mode 100644 index 000000000..b423ac134 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init.yml @@ -0,0 +1,14 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.infra + - cluster.mcp-ovs-ha.openstack +parameters: + _param: + cluster_name: mcp-ovs-ha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init_vcp.yml.j2 similarity index 92% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init_vcp.yml.j2 index 9e85995bc..239c9a725 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/init_vcp.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/init_vcp.yml.j2 @@ -8,5 +8,5 @@ --- {%- if conf.MCP_VCP %} classes: - - cluster.mcp-pike-ovs-dpdk-ha.infra + - cluster.mcp-ovs-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/kvm.yml.j2 similarity index 87% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-ha/infra/kvm.yml.j2 index b62118d4a..238c0cbab 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/kvm.yml.j2 @@ -9,6 +9,6 @@ {%- if conf.MCP_VCP %} # NOTE(armband): we don't want to pull in salt.control for novcp classes: - - cluster.mcp-pike-common-ha.infra.kvm - - cluster.mcp-pike-ovs-dpdk-ha.infra + - cluster.mcp-common-ha.infra.kvm + - cluster.mcp-ovs-ha.infra {%- endif %} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml new file mode 100644 index 000000000..c9102ea70 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/infra/maas.yml @@ -0,0 +1,11 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.infra.maas + - cluster.mcp-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/init.yml similarity index 85% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/init.yml rename to mcp/reclass/classes/cluster/mcp-ovs-ha/init.yml index 07ad6734c..73f4ea6dd 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/init.yml @@ -8,5 +8,5 @@ --- classes: - cluster.all-mcp-arch-common - - cluster.mcp-pike-ovs-dpdk-ha.infra - - cluster.mcp-pike-ovs-dpdk-ha.openstack + - cluster.mcp-ovs-ha.infra + - cluster.mcp-ovs-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml similarity index 81% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml rename to mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml index 36073827a..1e157cfa7 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute.yml @@ -7,9 +7,9 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-ovn-ha.openstack.compute_pdf - - cluster.mcp-pike-ovn-ha.infra + - cluster.mcp-common-ha.openstack_compute + - cluster.mcp-ovs-ha.openstack.compute_pdf + - cluster.mcp-ovs-ha.infra parameters: nova: compute: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 similarity index 100% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 rename to mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/compute_pdf.yml.j2 diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml similarity index 78% rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml rename to mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml index a70a8a07f..47257e0ff 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/control.yml @@ -8,6 +8,6 @@ --- classes: - system.neutron.control.openvswitch.cluster - - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_control - - cluster.mcp-pike-ovs-ha.infra + - cluster.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_control + - cluster.mcp-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml new file mode 100644 index 000000000..c0002d9c1 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/database.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_database + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml similarity index 92% rename from mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml rename to mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml index 02cd14adb..9dbfd59a1 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/init.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-common-ha.openstack_init + - cluster.mcp-common-ha.openstack_init parameters: _param: neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml new file mode 100644 index 000000000..3fe3c0eaa --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/message_queue.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_message_queue + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml new file mode 100644 index 000000000..27120ffe3 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/proxy.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_triport + - cluster.mcp-common-ha.openstack_proxy + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml new file mode 100644 index 000000000..161eb9f1e --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-ha/openstack/telemetry.yml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 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.mcp-common-ha.openstack_interface_vcp_biport + - cluster.mcp-common-ha.openstack_telemetry + - cluster.mcp-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml deleted file mode 100644 index 69cb24dbf..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml deleted file mode 100644 index 604728da1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml deleted file mode 100644 index 20df2aab6..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-odl-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml deleted file mode 100644 index 398768e08..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/infra/maas.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-ovn-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml deleted file mode 100644 index 2ed79ab3b..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml deleted file mode 100644 index db587ac94..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml deleted file mode 100644 index 49fec8246..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/proxy.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_triport - - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml deleted file mode 100644 index 4b9d9acc2..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-ovn-ha.infra_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml deleted file mode 100644 index f472885e2..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/maas.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-ovs-dpdk-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml deleted file mode 100644 index 324ec3f84..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml deleted file mode 100644 index f15e4310a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml deleted file mode 100644 index 09eda53c0..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_triport - - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml deleted file mode 100644 index 68d437864..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-ovs-dpdk-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml deleted file mode 100644 index d0aabd90f..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/maas.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-ovs-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml deleted file mode 100644 index 33c86e8c1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_database - - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml deleted file mode 100644 index 629b2794b..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_message_queue - - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml deleted file mode 100644 index 3698965f6..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_triport - - cluster.mcp-pike-common-ha.openstack_proxy - - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml deleted file mode 100644 index 26341ea7b..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 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.mcp-pike-common-ha.openstack_interface_vcp_biport - - cluster.mcp-pike-common-ha.openstack_telemetry - - cluster.mcp-pike-ovs-ha.infra.init_vcp diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 3d227a7e3..0d3fc1ed4 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 3d227a7e3be6d3da6a459cc8254637be2228d1fb +Subproject commit 0d3fc1ed410c463df962315621aff4b2235825d2 diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-odl-ha.local.yml similarity index 88% rename from mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml rename to mcp/reclass/nodes/cfg01.mcp-odl-ha.local.yml index cbab34b45..dbf3a4adf 100644 --- a/mcp/reclass/nodes/cfg01.mcp-pike-odl-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-odl-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-odl-ha.infra.config + - cluster.mcp-odl-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-pike-odl-ha.local + domain: mcp-odl-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovn-ha.local.yml similarity index 88% rename from mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml rename to mcp/reclass/nodes/cfg01.mcp-ovn-ha.local.yml index 2c370db60..00fc19eb4 100644 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-ovn-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-ovn-ha.infra.config + - cluster.mcp-ovn-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-pike-ovn-ha.local + domain: mcp-ovn-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-ha.local.yml similarity index 87% rename from mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml rename to mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-ha.local.yml index c31233bb5..d51b66da5 100644 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-ovs-dpdk-ha.infra.config + - cluster.mcp-ovs-dpdk-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-pike-ovs-dpdk-ha.local + domain: mcp-ovs-dpdk-ha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-ha.local.yml similarity index 88% rename from mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml rename to mcp/reclass/nodes/cfg01.mcp-ovs-ha.local.yml index 5e3cb0186..d5171277d 100644 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml +++ b/mcp/reclass/nodes/cfg01.mcp-ovs-ha.local.yml @@ -7,7 +7,7 @@ ############################################################################## --- classes: - - cluster.mcp-pike-ovs-ha.infra.config + - cluster.mcp-ovs-ha.infra.config parameters: _param: linux_system_codename: xenial @@ -15,4 +15,4 @@ parameters: linux: system: name: cfg01 - domain: mcp-pike-ovs-ha.local + domain: mcp-ovs-ha.local -- 2.16.6