From afae8d4d99d962448eb62cdd306f7a3dcda83744 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 4 Jun 2018 17:55:52 +0400 Subject: [noha] Update OpenStack version to Queens * make cluster names version-agnostic * pre-install oslo-templates formula * salt version update to 2017.7 * system reclass update Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869 Signed-off-by: Michael Polenchuk --- mcp/config/scenario/defaults.yaml | 12 +- mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 2 +- mcp/config/scenario/os-nosdn-ovs-noha.yaml | 2 +- mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 +- mcp/config/scenario/os-odl-ovs-noha.yaml | 2 +- mcp/config/scenario/os-ovn-nofeature-noha.yaml | 2 +- mcp/reclass/classes/cluster/.gitignore | 4 +- .../mcp-common-noha/haproxy_openstack_api.yml | 173 +++++++++++++++++++++ .../cluster/mcp-common-noha/infra/config.yml | 80 ++++++++++ .../classes/cluster/mcp-common-noha/infra/init.yml | 29 ++++ .../cluster/mcp-common-noha/init_options.yml | 28 ++++ .../cluster/mcp-common-noha/openstack_compute.yml | 70 +++++++++ .../mcp-common-noha/openstack_compute_pdf.yml.j2 | 44 ++++++ .../cluster/mcp-common-noha/openstack_control.yml | 167 ++++++++++++++++++++ .../mcp-common-noha/openstack_control_pdf.yml.j2 | 32 ++++ .../cluster/mcp-common-noha/openstack_gateway.yml | 21 +++ .../mcp-common-noha/openstack_gateway_pdf.yml.j2 | 70 +++++++++ .../cluster/mcp-common-noha/openstack_init.yml | 134 ++++++++++++++++ .../cluster/mcp-odl-noha/infra/config.yml.j2 | 28 ++++ .../classes/cluster/mcp-odl-noha/infra/init.yml | 14 ++ mcp/reclass/classes/cluster/mcp-odl-noha/init.yml | 17 ++ .../cluster/mcp-odl-noha/opendaylight/control.yml | 30 ++++ .../mcp-odl-noha/opendaylight/control_pdf.yml.j2 | 25 +++ .../cluster/mcp-odl-noha/openstack/compute.yml.j2 | 72 +++++++++ .../cluster/mcp-odl-noha/openstack/control.yml | 34 ++++ .../cluster/mcp-odl-noha/openstack/gateway.yml | 25 +++ .../cluster/mcp-odl-noha/openstack/init.yml | 22 +++ .../classes/cluster/mcp-ovn-noha/infra/config.yml | 11 ++ .../classes/cluster/mcp-ovn-noha/infra/init.yml | 14 ++ mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml | 13 ++ .../cluster/mcp-ovn-noha/openstack/compute.yml | 52 +++++++ .../cluster/mcp-ovn-noha/openstack/control.yml | 12 ++ .../cluster/mcp-ovn-noha/openstack/init.yml | 10 ++ .../cluster/mcp-ovs-dpdk-noha/infra/config.yml | 21 +++ .../cluster/mcp-ovs-dpdk-noha/infra/init.yml | 14 ++ .../classes/cluster/mcp-ovs-dpdk-noha/init.yml | 13 ++ .../mcp-ovs-dpdk-noha/openstack/compute.yml | 35 +++++ .../mcp-ovs-dpdk-noha/openstack/control.yml | 17 ++ .../mcp-ovs-dpdk-noha/openstack/gateway.yml | 26 ++++ .../cluster/mcp-ovs-dpdk-noha/openstack/init.yml | 13 ++ .../classes/cluster/mcp-ovs-noha/infra/config.yml | 21 +++ .../classes/cluster/mcp-ovs-noha/infra/init.yml | 14 ++ mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml | 13 ++ .../cluster/mcp-ovs-noha/openstack/compute.yml | 24 +++ .../cluster/mcp-ovs-noha/openstack/control.yml | 12 ++ .../cluster/mcp-ovs-noha/openstack/gateway.yml | 25 +++ .../cluster/mcp-ovs-noha/openstack/init.yml | 13 ++ .../cluster/mcp-pike-common-ha/infra/init.yml.j2 | 2 +- .../cluster/mcp-pike-common-ha/infra/maas.yml | 2 +- .../mcp-pike-common-noha/haproxy_openstack_api.yml | 173 --------------------- .../cluster/mcp-pike-common-noha/infra/config.yml | 80 ---------- .../cluster/mcp-pike-common-noha/infra/init.yml | 29 ---- .../cluster/mcp-pike-common-noha/init_options.yml | 28 ---- .../mcp-pike-common-noha/openstack_compute.yml | 70 --------- .../openstack_compute_pdf.yml.j2 | 44 ------ .../mcp-pike-common-noha/openstack_control.yml | 151 ------------------ .../openstack_control_pdf.yml.j2 | 32 ---- .../mcp-pike-common-noha/openstack_gateway.yml | 21 --- .../openstack_gateway_pdf.yml.j2 | 70 --------- .../mcp-pike-common-noha/openstack_init.yml | 134 ---------------- .../cluster/mcp-pike-odl-noha/infra/config.yml.j2 | 28 ---- .../cluster/mcp-pike-odl-noha/infra/init.yml | 14 -- .../classes/cluster/mcp-pike-odl-noha/init.yml | 17 -- .../mcp-pike-odl-noha/opendaylight/control.yml | 30 ---- .../opendaylight/control_pdf.yml.j2 | 25 --- .../mcp-pike-odl-noha/openstack/compute.yml.j2 | 72 --------- .../mcp-pike-odl-noha/openstack/control.yml | 34 ---- .../mcp-pike-odl-noha/openstack/gateway.yml | 25 --- .../cluster/mcp-pike-odl-noha/openstack/init.yml | 22 --- .../cluster/mcp-pike-ovn-noha/infra/config.yml | 11 -- .../cluster/mcp-pike-ovn-noha/infra/init.yml | 14 -- .../classes/cluster/mcp-pike-ovn-noha/init.yml | 13 -- .../mcp-pike-ovn-noha/openstack/compute.yml | 52 ------- .../mcp-pike-ovn-noha/openstack/control.yml | 12 -- .../cluster/mcp-pike-ovn-noha/openstack/init.yml | 10 -- .../mcp-pike-ovs-dpdk-noha/infra/config.yml | 21 --- .../cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml | 14 -- .../cluster/mcp-pike-ovs-dpdk-noha/init.yml | 13 -- .../mcp-pike-ovs-dpdk-noha/openstack/compute.yml | 35 ----- .../mcp-pike-ovs-dpdk-noha/openstack/control.yml | 17 -- .../mcp-pike-ovs-dpdk-noha/openstack/gateway.yml | 26 ---- .../mcp-pike-ovs-dpdk-noha/openstack/init.yml | 13 -- .../cluster/mcp-pike-ovs-noha/infra/config.yml | 21 --- .../cluster/mcp-pike-ovs-noha/infra/init.yml | 14 -- .../classes/cluster/mcp-pike-ovs-noha/init.yml | 13 -- .../mcp-pike-ovs-noha/openstack/compute.yml | 24 --- .../mcp-pike-ovs-noha/openstack/control.yml | 12 -- .../mcp-pike-ovs-noha/openstack/gateway.yml | 25 --- .../cluster/mcp-pike-ovs-noha/openstack/init.yml | 13 -- mcp/reclass/classes/system | 2 +- mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml | 18 +++ mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml | 18 +++ .../nodes/cfg01.mcp-ovs-dpdk-noha.local.yml | 18 +++ mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml | 18 +++ .../nodes/cfg01.mcp-pike-odl-noha.local.yml | 18 --- .../nodes/cfg01.mcp-pike-ovn-noha.local.yml | 18 --- .../nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml | 18 --- .../nodes/cfg01.mcp-pike-ovs-noha.local.yml | 18 --- mcp/scripts/salt.sh | 4 +- 99 files changed, 1578 insertions(+), 1562 deletions(-) create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/infra/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml create mode 100644 mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml create mode 100644 mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml delete mode 100644 mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 6affc7da6..283ffc542 100644 --- a/mcp/config/scenario/defaults.yaml +++ b/mcp/config/scenario/defaults.yaml @@ -14,10 +14,10 @@ x86_64: common: apt: keys: - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub repos: # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main pkg: install: - linux-generic-hwe-16.04 @@ -35,12 +35,12 @@ aarch64: common: apt: keys: - - https://linux.enea.com/mcp-repos/pike/xenial/archive-mcppike.key - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub + - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub repos: # deb [arch=] - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main - - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main pkg: install: - linux-generic-hwe-16.04 diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 3a36ae297..1926d4977 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovs-noha.local + domain: mcp-ovs-noha.local states: - openstack_noha - neutron_gateway diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index eed17c1a4..b44647c25 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovs-dpdk-noha.local + domain: mcp-ovs-dpdk-noha.local states: - dpdk - openstack_noha diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index f52eaf5aa..c61abd539 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-odl-noha.local + domain: mcp-odl-noha.local states: - opendaylight - openstack_noha diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml index c282707f7..84eaf6318 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-odl-noha.local + domain: mcp-odl-noha.local states: - dpdk - opendaylight diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index 104df96d3..d2015754e 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovn-noha.local + domain: mcp-ovn-noha.local states: - openstack_noha - networks diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index 7d40a2bec..a37a68691 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -15,5 +15,5 @@ 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-pike-odl-noha/infra/config.yml -mcp-pike-odl-noha/openstack/compute.yml +mcp-odl-noha/infra/config.yml +mcp-odl-noha/openstack/compute.yml diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml new file mode 100644 index 000000000..7235071f5 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml @@ -0,0 +1,173 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 + haproxy: + proxy: + listen: + cinder_api: + type: openstack-service + service_name: cinder + binds: + - address: ${_param:cluster_vip_address} + port: 8776 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8776 + params: ${_param:haproxy_check} + glance_api: + type: openstack-service + service_name: glance + binds: + - address: ${_param:cluster_vip_address} + port: 9292 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9292 + params: ${_param:haproxy_check} + glance_registry_api: + type: general-service + service_name: glance + binds: + - address: ${_param:cluster_vip_address} + port: 9191 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9191 + params: ${_param:haproxy_check} + heat_cloudwatch_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8003 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8003 + params: ${_param:haproxy_check} + heat_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8004 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8004 + params: ${_param:haproxy_check} + heat_cfn_api: + type: openstack-service + service_name: heat + binds: + - address: ${_param:cluster_vip_address} + port: 8000 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8000 + params: ${_param:haproxy_check} + keystone_public_api: + type: openstack-service + service_name: keystone + binds: + - address: ${_param:cluster_vip_address} + port: 5000 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 5000 + params: ${_param:haproxy_check} + keystone_admin_api: + type: openstack-service + service_name: keystone + binds: + - address: ${_param:cluster_vip_address} + port: 35357 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 35357 + params: ${_param:haproxy_check} + neutron_api: + type: openstack-service + service_name: neutron + binds: + - address: ${_param:cluster_vip_address} + port: 9696 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 9696 + params: ${_param:haproxy_check} + nova_placement_api: + mode: http + binds: + - address: ${_param:cluster_vip_address} + port: 8778 + options: + - httpclose + - httplog + health-check: + http: + options: + - expect status 401 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8778 + params: ${_param:haproxy_check} + nova_api: + type: openstack-service + service_name: nova + binds: + - address: ${_param:cluster_vip_address} + port: 8774 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8774 + params: ${_param:haproxy_check} + nova_metadata_api: + type: openstack-service + binds: + - address: ${_param:cluster_vip_address} + port: 8775 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8775 + params: ${_param:haproxy_check} + ceilometer_api: + type: general-service + check: false + binds: + - address: ${_param:cluster_vip_address} + port: 8777 + servers: + - name: ${_param:cluster_node01_hostname} + host: ${_param:cluster_node01_address} + port: 8777 + params: ${_param:haproxy_check} + aodh-api: + type: openstack-service + service_name: aodh + binds: + - address: ${_param:cluster_vip_address} + port: 8042 + servers: + - name: ctl01 + host: ${_param:cluster_node01_address} + port: 8042 + params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml new file mode 100644 index 000000000..00f3b76ab --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/config.yml @@ -0,0 +1,80 @@ +############################################################################## +# 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: + - service.git.client + - system.linux.system.single + - system.linux.system.repo.mcp.salt + - system.salt.master.api + - system.salt.master.pkg + - system.reclass.storage.salt + - system.salt.minion.ca.salt_master + - system.mysql.client.single + - system.reclass.storage.system.openstack_compute_multi +parameters: + _param: + openstack_control_node01_hostname: ctl01 + reclass_data_repository: local + reclass_config_master: ${_param:opnfv_infra_config_pxe_address} + salt_master_environment_repository: "https://github.com/tcpcloud" + salt_master_environment_revision: master + single_address: ${_param:opnfv_infra_config_address} + salt_master_host: 127.0.0.1 + salt_master_base_environment: prd + salt_minion_ca_host: ${linux:network:fqdn} + # yamllint disable-line rule:line-length + salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" + linux: + network: + interface: + dhcp: + enabled: true + type: eth + proto: dhcp + name: ${_param:opnfv_fn_vm_primary_interface} + single_int: + enabled: true + name: ${_param:opnfv_fn_vm_secondary_interface} + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + pxe: + enabled: true + type: eth + proto: static + name: ${_param:opnfv_fn_vm_tertiary_interface} + address: ${_param:opnfv_infra_config_pxe_address} + netmask: 255.255.255.0 + salt: + master: + file_recv: true + reclass: + storage: + data_source: + engine: local + node: + openstack_control_node01: + name: ${_param:openstack_control_node01_hostname} + domain: ${_param:cluster_domain} + classes: + - cluster.${_param:cluster_name}.openstack.control + params: + linux_system_codename: xenial + salt_master_host: ${_param:reclass_config_master} + single_address: ${_param:openstack_control_node01_address} + openstack_compute_node01: + params: + single_address: ${_param:opnfv_openstack_compute_node01_control_address} + tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address} + external_address: ${_param:opnfv_openstack_compute_node01_external_address} + openstack_compute_node02: + params: + single_address: ${_param:opnfv_openstack_compute_node02_control_address} + tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address} + external_address: ${_param:opnfv_openstack_compute_node02_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml new file mode 100644 index 000000000..ede41940a --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/infra/init.yml @@ -0,0 +1,29 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + cluster_domain: ${_param:cluster_name}.local + linux: + system: + apt: + config: + prefer_ipv4: + Acquire::ForceIPv4: true + network: + host: + cfg01: + address: ${_param:infra_config_address} + names: + - cfg01 + - cfg01.${_param:cluster_domain} + cfg: + address: ${_param:infra_config_address} + names: + - cfg + - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml new file mode 100644 index 000000000..69aba92ad --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/init_options.yml @@ -0,0 +1,28 @@ +############################################################################## +# 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.all-mcp-arch-common +parameters: + _param: + # infra service addresses + infra_config_address: ${_param:opnfv_infra_config_address} + # openstack service addresses + openstack_control_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} + openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} + openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} + openstack_database_address: ${_param:openstack_control_address} + openstack_message_queue_address: ${_param:openstack_control_address} + openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} + openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} + openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} + openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address} + control_address: ${_param:openstack_control_address} + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml new file mode 100644 index 000000000..edd7f9f58 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -0,0 +1,70 @@ +############################################################################## +# 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: + - service.nfs.client + - system.nova.compute.single + - service.cinder.volume.single + - system.cinder.volume.backend.lvm + - system.ceilometer.agent.cluster + - system.ceilometer.client.nova_compute + - system.ceilometer.client.cinder_volume + - system.ceilometer.agent.polling.default + - system.linux.system.repo.mcp.openstack + - cluster.mcp-common-noha.openstack_compute_pdf +parameters: + _param: + interface_mtu: 9000 + linux_system_codename: xenial + ~cinder_lvm_devices: ['/dev/vdb'] + nova: + compute: + libvirt_service: libvirtd + libvirt_bin: /etc/default/libvirtd + disk_cachemodes: file=directsync,block=none + vncproxy_url: http://${_param:cluster_vip_address}:6080 + bind: + vnc_address: ${_param:single_address} + network: + region: ${_param:openstack_region} + user: neutron + tenant: service + password: ${_param:keystone_neutron_password} + neutron: + compute: + notification: true + vlan_aware_vms: true + root_helper_daemon: false + agent_mode: ${_param:neutron_compute_agent_mode} + message_queue: + host: ${_param:openstack_control_address} + metadata: + host: ${_param:openstack_control_address} + cinder: + volume: + database: + host: ${_param:cluster_local_address} + identity: + host: ${_param:cluster_local_address} + glance: + host: ${_param:cluster_local_address} + message_queue: + host: ${_param:cluster_local_address} + nfs: + client: + mount: + nfs: + path: /var/lib/nova/instances + fstype: nfs + device: ${_param:openstack_control_address}:/srv/nova/instances + linux: + system: + kernel: + sysctl: + vm.dirty_ratio: 10 + vm.dirty_background_ratio: 5 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 new file mode 100644 index 000000000..64af148fd --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 @@ -0,0 +1,44 @@ +############################################################################## +# 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 +############################################################################## +{#- NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} +{%- import 'net_map.j2' as nm with context %} +--- +parameters: + _param: + primary_interface: {{ nm.cmp001.nic_mgmt }} + tenant_interface: {{ nm.cmp001.nic_private }} + external_interface: {{ nm.cmp001.nic_public }} + linux: + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: {{ nm.cmp001.nic_admin }} + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml new file mode 100644 index 000000000..c4915c795 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml @@ -0,0 +1,167 @@ +############################################################################## +# 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: + - system.linux.system.lowmem + - system.linux.system.repo.mcp.openstack + - service.nfs.server + - system.ceilometer.client + - system.ceilometer.client.neutron + - system.memcached.server.single + - system.rabbitmq.server.single + - system.rabbitmq.server.vhost.openstack + - system.keystone.server.wsgi + - system.keystone.server.single + - system.keystone.client.single + - system.keystone.client.v3.service.keystone + - system.keystone.client.service.nova21 + - system.keystone.client.service.nova-placement + - system.keystone.client.service.cinder3 + - system.keystone.client.service.ceilometer + - system.keystone.client.service.aodh + - system.keystone.client.service.gnocchi + - system.keystone.client.service.panko + - system.glance.control.single + - system.nova.control.single + - system.cinder.control.single + - system.cinder.control.backend.lvm + - system.heat.server.single + - service.mysql.server.single + - system.galera.server.database.cinder + - system.galera.server.database.glance + - system.galera.server.database.grafana + - system.galera.server.database.heat + - system.galera.server.database.keystone + - system.galera.server.database.nova + - system.galera.server.database.ceilometer + - system.galera.server.database.aodh + - system.galera.server.database.gnocchi + - system.galera.server.database.panko + - service.redis.server.single + - service.ceilometer.server.single + - system.ceilometer.server.coordination.redis + - system.ceilometer.server.backend.default + - system.aodh.server.single + - system.aodh.server.coordination.redis + - system.gnocchi.server.single + - system.gnocchi.common.storage.incoming.redis + - system.gnocchi.common.storage.redis + - system.gnocchi.common.coordination.redis + - service.panko.server.single + - system.apache.server.site.gnocchi + - system.apache.server.site.panko + - system.horizon.server.single + - service.haproxy.proxy.single + - cluster.mcp-common-noha.haproxy_openstack_api + - cluster.mcp-common-noha.openstack_control_pdf +parameters: + _param: + linux_system_codename: xenial + ceilometer_create_gnocchi_resources: 'True' + linux: + system: + package: + python-msgpack: + version: latest + keystone: + server: + admin_email: ${_param:admin_email} + openrc_extra: + volume_device_name: vdc + pkgs: + - keystone + - python-psycopg2 + - python-mysqldb + - python-openstackclient + - python-tornado + 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' + glance: + server: + storage: + engine: file + images: [] + workers: 1 + nova: + controller: + networking: dvr + cpu_allocation: 54 + metadata: + password: ${_param:metadata_password} + bind: + private_address: ${_param:cluster_local_address} + public_address: ${_param:cluster_vip_address} + novncproxy_port: 6080 + vncproxy_url: http://${_param:cluster_vip_address}:6080 + workers: 1 + horizon: + server: + # yamllint disable-line rule:truthy + secure: False + heat: + server: + bind: + api_cfn: + address: ${_param:single_address} + api_cloudwatch: + address: ${_param:single_address} + mysql: + server: + version: '5.7' + bind: + address: ${_param:cluster_local_address} + key_buffer: 8 + max_allowed_packet: 128 + max_connections: 2048 + thread_stack: 512 + thread_cache_size: 12 + query_cache_limit: 2 + query_cache_size: 0 + ceilometer: + server: + ~database: ~ + redis: + server: + version: 3.0 + appendfsync: 'no' + bind: + address: ${_param:single_address} + nfs: + server: + share: + nova_instances: + path: /srv/nova/instances + host: + nova: + host: ${_param:single_address}/24 + params: + - rw + - no_root_squash + - async + neutron: + server: + vlan_aware_vms: true + root_helper_daemon: false + apache: + server: + site: + gnocchi: + wsgi: + threads: 1 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 new file mode 100644 index 000000000..8219637dc --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control_pdf.yml.j2 @@ -0,0 +1,32 @@ +############################################################################## +# 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 +############################################################################## +{%- import 'net_map.j2' as nm with context %} +--- +parameters: + linux: + network: + interface: + dhcp_int: + enabled: true + name: {{ nm.ctl01.nic_admin }} + proto: dhcp + type: eth + single_int: + enabled: true + name: {{ nm.ctl01.nic_mgmt }} + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + public_int: + enabled: true + name: {{ nm.ctl01.nic_public }} + type: eth + proto: static + address: ${_param:cluster_public_host} + netmask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml new file mode 100644 index 000000000..0062adf16 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -0,0 +1,21 @@ +############################################################################## +# 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: + - system.linux.system.repo.mcp.openstack + - cluster.mcp-common-noha.openstack_gateway_pdf +parameters: + _param: + interface_mtu: 9000 + linux_system_codename: xenial + neutron: + gateway: + notification: true + agent_mode: ${_param:neutron_gateway_agent_mode} + vlan_aware_vms: true + root_helper_daemon: false diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 new file mode 100644 index 000000000..7067d59a4 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway_pdf.yml.j2 @@ -0,0 +1,70 @@ +############################################################################## +# 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 +############################################################################## +--- +{%- import 'net_map.j2' as nm with context %} +parameters: + _param: + primary_interface: {{ nm.ctl01.nic_mgmt }} + tenant_interface: {{ nm.ctl01.nic_private }} + external_interface: {{ nm.ctl01.nic_public }} + linux: + network: + bridge: openvswitch + interface: + dhcp_int: + enabled: true + name: {{ nm.ctl01.nic_admin }} + proto: dhcp + type: eth + mtu: ${_param:interface_mtu} + primary_interface: + enabled: true + name: ${_param:primary_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + tenant_interface: + enabled: true + name: ${_param:tenant_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + br-mgmt: + enabled: true + type: bridge + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 + mtu: ${_param:interface_mtu} + use_interfaces: + - ${_param:primary_interface} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml new file mode 100644 index 000000000..f76333374 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml @@ -0,0 +1,134 @@ +############################################################################## +# 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 +############################################################################## +--- +parameters: + _param: + openstack_version: queens + apt_mk_version: nightly + mcp_repo_version: 1.1 + openstack_region: RegionOne + admin_email: root@localhost + cluster_public_protocol: http + cluster_public_host: ${_param:opnfv_openstack_control_node01_external_address} + neutron_public_protocol: http + neutron_control_dvr: 'False' + neutron_l3_ha: 'False' + neutron_global_physnet_mtu: 1500 + neutron_external_mtu: 1500 + neutron_gateway_dvr: 'False' + neutron_gateway_agent_mode: legacy + neutron_compute_dvr: 'False' + neutron_compute_agent_mode: legacy + neutron_compute_external_access: 'False' + galera_server_cluster_name: openstack_cluster + galera_server_maintenance_password: opnfv_secret + galera_server_admin_password: opnfv_secret + cluster_vip_address: ${_param:cluster_public_host} + cluster_local_address: ${_param:openstack_control_address} + cluster_node01_hostname: ctl01 + cluster_node01_address: ${_param:opnfv_openstack_control_node01_address} + cluster_node02_hostname: ctl02 + cluster_node02_address: ${_param:opnfv_openstack_control_node02_address} + cluster_node03_hostname: ctl03 + cluster_node03_address: ${_param:opnfv_openstack_control_node03_address} + rabbitmq_secret_key: opnfv_secret + rabbitmq_admin_password: opnfv_secret + rabbitmq_openstack_password: opnfv_secret + rabbitmq_cold_password: opnfv_secret + glance_version: ${_param:openstack_version} + glance_service_host: ${_param:cluster_local_address} + keystone_version: ${_param:openstack_version} + keystone_service_host: ${_param:cluster_local_address} + heat_version: ${_param:openstack_version} + heat_service_host: ${_param:cluster_local_address} + heat_domain_admin_password: opnfv_secret + ceilometer_version: ${_param:openstack_version} + ceilometer_service_host: ${_param:cluster_local_address} + ceilometer_database_host: ${_param:cluster_local_address} + cinder_version: ${_param:openstack_version} + cinder_service_host: ${_param:cluster_local_address} + nova_version: ${_param:openstack_version} + nova_service_host: ${_param:cluster_local_address} + nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 + neutron_version: ${_param:openstack_version} + neutron_service_host: ${_param:cluster_local_address} + mysql_admin_user: root + mysql_admin_password: opnfv_secret + mysql_cinder_password: opnfv_secret + mysql_ceilometer_password: opnfv_secret + mysql_glance_password: opnfv_secret + mysql_grafana_password: opnfv_secret + mysql_heat_password: opnfv_secret + mysql_keystone_password: opnfv_secret + mysql_neutron_password: opnfv_secret + mysql_nova_password: opnfv_secret + mysql_aodh_password: opnfv_secret + keystone_service_token: opnfv_secret + keystone_admin_password: opnfv_secret + keystone_ceilometer_password: opnfv_secret + keystone_cinder_password: opnfv_secret + keystone_glance_password: opnfv_secret + keystone_heat_password: opnfv_secret + keystone_keystone_password: opnfv_secret + keystone_neutron_password: opnfv_secret + keystone_nova_password: opnfv_secret + ceilometer_secret_key: opnfv_secret + metadata_password: opnfv_secret + horizon_version: ${_param:openstack_version} + horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e + horizon_identity_host: ${_param:cluster_vip_address} + horizon_identity_encryption: none + horizon_identity_version: 3 + aodh_version: ${_param:openstack_version} + keystone_aodh_password: opnfv_secret + aodh_service_host: ${_param:cluster_local_address} + gnocchi_version: 4.0 + gnocchi_service_host: ${_param:cluster_local_address} + mysql_gnocchi_password: opnfv_secret + keystone_gnocchi_password: opnfv_secret + panko_version: ${_param:openstack_version} + panko_service_host: ${_param:cluster_local_address} + mysql_panko_password: opnfv_secret + keystone_panko_password: opnfv_secret + ceilometer_agent_default_polling_interval: 180 + ceilometer_agent_default_polling_meters: + - "*" + linux: + system: + kernel: + sysctl: + net.ipv4.tcp_congestion_control: yeah + net.ipv4.tcp_slow_start_after_idle: 0 + net.ipv4.tcp_fin_timeout: 30 + network: + host: + ctl: + address: ${_param:openstack_control_address} + names: + - ctl + - ctl.${_param:cluster_domain} + ctl01: + address: ${_param:openstack_control_node01_address} + names: + - ctl01 + - ctl01.${_param:cluster_domain} + gtw01: + address: ${_param:openstack_gateway_address} + names: + - gtw01 + - gtw01.${_param:cluster_domain} + cmp01: + address: ${_param:opnfv_openstack_compute_node01_control_address} + names: + - cmp01 + - cmp01.${_param:cluster_domain} + cmp02: + address: ${_param:opnfv_openstack_compute_node02_control_address} + names: + - cmp02 + - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 new file mode 100644 index 000000000..43e8c1f39 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/config.yml.j2 @@ -0,0 +1,28 @@ +############################################################################## +# 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: + - system.reclass.storage.system.opendaylight_control_single + - system.reclass.storage.system.openstack_gateway_single + - cluster.mcp-common-noha.infra.config + - cluster.mcp-odl-noha + - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf +parameters: + reclass: + storage: + node: + opendaylight_control_node01: + classes: + - cluster.${_param:cluster_name}.opendaylight.control + params: + linux_system_codename: xenial + single_address: ${_param:opendaylight_service_host} + openstack_gateway_node01: + params: + tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/infra/init.yml new file mode 100644 index 000000000..a80228ccd --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/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-noha.infra + +parameters: + _param: + cluster_name: mcp-odl-noha diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml new file mode 100644 index 000000000..a595bf0b5 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/init.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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: + - system.linux.system.single + - cluster.mcp-common-noha.init_options + - cluster.mcp-odl-noha.infra + - cluster.mcp-odl-noha.openstack + +parameters: + _param: + opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml new file mode 100644 index 000000000..0b513f065 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml @@ -0,0 +1,30 @@ +############################################################################## +# 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: + - system.linux.system.repo.mcp.openstack + - system.linux.system.repo.mcp.extra + - service.opendaylight.server.single + - cluster.mcp-odl-noha + - cluster.mcp-odl-noha.opendaylight.control_pdf +parameters: + _param: + linux_system_codename: xenial + opendaylight: + server: + odl_bind_ip: ${_param:single_address} + odl_rest_port: 8282 + java_min_mem: 3g + java_max_mem: 3g + router_enabled: true + karaf_features: + odl_default: + - odl-restconf-all + - odl-aaa-authn + netvirt: + - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 new file mode 100644 index 000000000..fbb7de8b3 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control_pdf.yml.j2 @@ -0,0 +1,25 @@ +############################################################################## +# 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 +############################################################################## +{%- import 'net_map.j2' as nm with context %} +--- +parameters: + linux: + network: + interface: + dhcp_int: + enabled: true + name: {{ nm.ctl01.nic_admin }} + proto: dhcp + type: eth + single_int: + enabled: true + name: {{ nm.ctl01.nic_mgmt }} + type: eth + proto: static + address: ${_param:single_address} + netmask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 new file mode 100644 index 000000000..d0ee3a3e0 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 @@ -0,0 +1,72 @@ +############################################################################## +# 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: + - service.neutron.compute.single + - service.neutron.compute.opendaylight.single +{%- if conf.MCP_DPDK_MODE %} + - system.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk +{%- endif %} + - cluster.mcp-common-noha.openstack_compute + - cluster.mcp-odl-noha +parameters: + linux: + network: + interface: +{%- if conf.MCP_DPDK_MODE %} + dpdk0: + name: ${_param:dpdk0_name} + pci: ${_param:dpdk0_pci} + driver: ${_param:dpdk0_driver} + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: ${_param:dpdk0_n_rxq} + br-prv: + enabled: true + type: dpdk_ovs_bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + tenant_interface: + type: dpdk # Not a meaningful type, just match 'dpdk' for filtering +{%- endif %} + external_interface: + enabled: true + type: eth + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + br-mesh: + enabled: true + type: bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: ${_param:opnfv_net_public_mask} + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml new file mode 100644 index 000000000..f5ed2dc5d --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/control.yml @@ -0,0 +1,34 @@ +############################################################################## +# 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: + - system.neutron.control.opendaylight.single + - cluster.mcp-common-noha.openstack_control + - cluster.mcp-odl-noha +parameters: + haproxy: + proxy: + listen: + opendaylight-rest: + type: general-service + service_name: opendaylight + binds: + - address: ${_param:cluster_vip_address} + port: 8282 + servers: + - name: odl01 + host: ${_param:opendaylight_service_host} + port: 8282 + params: ${_param:haproxy_check} + keystone: + server: + openrc_extra: + # For noHA, all public services are available through haproxy on ctl + sdn_controller_ip: ${_param:cluster_vip_address} + sdn_username: admin # Hardcoded to default ODL values for now + sdn_password: admin diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml new file mode 100644 index 000000000..e554eb6b6 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml @@ -0,0 +1,25 @@ +############################################################################## +# 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-noha.openstack_gateway + - service.neutron.gateway.opendaylight.single + - cluster.mcp-odl-noha +parameters: + linux: + network: + interface: + br-mesh: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml new file mode 100644 index 000000000..91e002667 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/init.yml @@ -0,0 +1,22 @@ +############################################################################## +# 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-noha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" + opendaylight_router: odl-router_v2 + linux: + network: + host: + odl01: + address: ${_param:opnfv_opendaylight_server_node01_single_address} + names: + - odl01 + - odl01.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.yml new file mode 100644 index 000000000..05f289b3a --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/config.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-noha.infra.config + - cluster.mcp-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/infra/init.yml new file mode 100644 index 000000000..229ebb5e5 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/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-noha.infra + +parameters: + _param: + cluster_name: mcp-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml new file mode 100644 index 000000000..d4b6d85b7 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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: + - system.linux.system.single + - cluster.mcp-common-noha.init_options + - cluster.mcp-ovn-noha.infra + - cluster.mcp-ovn-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml new file mode 100644 index 000000000..f8183e7f8 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml @@ -0,0 +1,52 @@ +############################################################################## +# 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: + - service.neutron.compute.ovn.single + - cluster.mcp-common-noha.openstack_compute + - cluster.mcp-ovn-noha +parameters: + neutron: + compute: + controller_vip: ${_param:cluster_local_address} + linux: + network: + interface: + external_interface: + enabled: true + name: ${_param:external_interface} + mtu: ${_param:interface_mtu} + proto: manual + type: eth + br-mesh: + enabled: true + type: bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} + br-floating: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} + float-to-ex: + enabled: true + type: ovs_port + mtu: ${_param:interface_mtu} + bridge: br-floating + br-ex: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + address: ${_param:external_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:external_interface} + use_ovs_ports: + - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.yml new file mode 100644 index 000000000..235beff26 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/control.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: + - system.neutron.control.ovn.single + - cluster.mcp-common-noha.openstack_control + - cluster.mcp-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml new file mode 100644 index 000000000..cba6b7741 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml @@ -0,0 +1,10 @@ +############################################################################## +# 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-noha.openstack_init diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml new file mode 100644 index 000000000..08c23026f --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/config.yml @@ -0,0 +1,21 @@ +############################################################################## +# 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: + - system.reclass.storage.system.openstack_gateway_single + - cluster.mcp-common-noha.infra.config + - cluster.mcp-ovs-dpdk-noha + - cluster.all-mcp-arch-common.infra.config_dpdk_pdf +parameters: + reclass: + storage: + node: + openstack_gateway_node01: + params: + tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/infra/init.yml new file mode 100644 index 000000000..f27c310ac --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/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-noha.infra + +parameters: + _param: + cluster_name: mcp-ovs-dpdk-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml new file mode 100644 index 000000000..96e2c9425 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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: + - system.linux.system.single + - cluster.mcp-common-noha.init_options + - cluster.mcp-ovs-dpdk-noha.infra + - cluster.mcp-ovs-dpdk-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml new file mode 100644 index 000000000..a4d6b8dd2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml @@ -0,0 +1,35 @@ +############################################################################## +# 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: + - system.nova.compute.nfv.hugepages + - system.neutron.compute.nfv.dpdk + - service.neutron.compute.single + - cluster.mcp-common-noha.openstack_compute + - cluster.mcp-ovs-dpdk-noha +parameters: + neutron: + compute: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + linux: + network: + interface: + dpdk0: + name: ${_param:dpdk0_name} + pci: ${_param:dpdk0_pci} + driver: ${_param:dpdk0_driver} + enabled: true + bridge: br-prv + type: dpdk_ovs_port + n_rxq: ${_param:dpdk0_n_rxq} + br-prv: + enabled: true + type: dpdk_ovs_bridge + tenant_interface: + type: dpdk # Not a meaningful type, just match 'dpdk' for filtering diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml new file mode 100644 index 000000000..bbd4d7cc2 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/control.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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: + - system.neutron.control.openvswitch.single + - cluster.mcp-common-noha.openstack_control + - cluster.mcp-ovs-dpdk-noha +parameters: + neutron: + server: + backend: + tenant_vlan_range: ${_param:opnfv_net_tenant_vlan} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml new file mode 100644 index 000000000..2f9aee6fd --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/gateway.yml @@ -0,0 +1,26 @@ +############################################################################## +# 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-noha.openstack_gateway + - service.neutron.gateway.single + - cluster.mcp-ovs-dpdk-noha +parameters: + neutron: + gateway: + backend: + tenant_network_types: ${_param:neutron_tenant_network_types} + linux: + network: + interface: + tenant_interface: + ovs_bridge: br-prv + br-prv: + enabled: true + type: ovs_bridge + mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml new file mode 100644 index 000000000..835d15a41 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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-noha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml new file mode 100644 index 000000000..6835a2622 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/config.yml @@ -0,0 +1,21 @@ +############################################################################## +# 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: + - system.reclass.storage.system.openstack_gateway_single + - cluster.mcp-common-noha.infra.config + - cluster.mcp-ovs-noha + - cluster.all-mcp-arch-common.infra.config_pdf +parameters: + reclass: + storage: + node: + openstack_gateway_node01: + params: + tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} + external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/infra/init.yml new file mode 100644 index 000000000..564061762 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/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-noha.infra + +parameters: + _param: + cluster_name: mcp-ovs-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml new file mode 100644 index 000000000..a453af50b --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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: + - system.linux.system.single + - cluster.mcp-common-noha.init_options + - cluster.mcp-ovs-noha.infra + - cluster.mcp-ovs-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml new file mode 100644 index 000000000..beddc4ae8 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml @@ -0,0 +1,24 @@ +############################################################################## +# 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: + - service.neutron.compute.single + - cluster.mcp-common-noha.openstack_compute + - cluster.mcp-ovs-noha +parameters: + linux: + network: + interface: + br-mesh: + enabled: true + type: bridge + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.yml new file mode 100644 index 000000000..939cb2834 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/control.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: + - system.neutron.control.openvswitch.single + - cluster.mcp-common-noha.openstack_control + - cluster.mcp-ovs-noha diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml new file mode 100644 index 000000000..b5dfcd40d --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/gateway.yml @@ -0,0 +1,25 @@ +############################################################################## +# 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-noha.openstack_gateway + - service.neutron.gateway.single + - cluster.mcp-ovs-noha +parameters: + linux: + network: + interface: + br-mesh: + enabled: true + type: bridge + mtu: ${_param:interface_mtu} + proto: static + address: ${_param:tenant_address} + netmask: 255.255.255.0 + use_interfaces: + - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml new file mode 100644 index 000000000..79e231825 --- /dev/null +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/init.yml @@ -0,0 +1,13 @@ +############################################################################## +# 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-noha.openstack_init +parameters: + _param: + neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 index 7f3839e82..21639e3bc 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2 @@ -15,7 +15,7 @@ parameters: _param: apt_mk_version: nightly mcp_repo_version: 1.1 - salt_version: 2016.11 + salt_version: 2017.7 cluster_domain: ${_param:cluster_name}.local # stacklight_environment: ${_param:cluster_domain} reclass_data_revision: master diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml index 238ae95a3..793a7efa5 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml @@ -42,7 +42,7 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: ${_param:hwe_kernel} cluster: - saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/ xenial main" + saltstack_repo_xenial: "http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/ xenial main" linux: network: interface: diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml deleted file mode 100644 index 7235071f5..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml +++ /dev/null @@ -1,173 +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 -############################################################################## ---- -parameters: - _param: - haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3 - haproxy: - proxy: - listen: - cinder_api: - type: openstack-service - service_name: cinder - binds: - - address: ${_param:cluster_vip_address} - port: 8776 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8776 - params: ${_param:haproxy_check} - glance_api: - type: openstack-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9292 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9292 - params: ${_param:haproxy_check} - glance_registry_api: - type: general-service - service_name: glance - binds: - - address: ${_param:cluster_vip_address} - port: 9191 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9191 - params: ${_param:haproxy_check} - heat_cloudwatch_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8003 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8003 - params: ${_param:haproxy_check} - heat_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8004 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8004 - params: ${_param:haproxy_check} - heat_cfn_api: - type: openstack-service - service_name: heat - binds: - - address: ${_param:cluster_vip_address} - port: 8000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8000 - params: ${_param:haproxy_check} - keystone_public_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 5000 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 5000 - params: ${_param:haproxy_check} - keystone_admin_api: - type: openstack-service - service_name: keystone - binds: - - address: ${_param:cluster_vip_address} - port: 35357 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 35357 - params: ${_param:haproxy_check} - neutron_api: - type: openstack-service - service_name: neutron - binds: - - address: ${_param:cluster_vip_address} - port: 9696 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 9696 - params: ${_param:haproxy_check} - nova_placement_api: - mode: http - binds: - - address: ${_param:cluster_vip_address} - port: 8778 - options: - - httpclose - - httplog - health-check: - http: - options: - - expect status 401 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8778 - params: ${_param:haproxy_check} - nova_api: - type: openstack-service - service_name: nova - binds: - - address: ${_param:cluster_vip_address} - port: 8774 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8774 - params: ${_param:haproxy_check} - nova_metadata_api: - type: openstack-service - binds: - - address: ${_param:cluster_vip_address} - port: 8775 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8775 - params: ${_param:haproxy_check} - ceilometer_api: - type: general-service - check: false - binds: - - address: ${_param:cluster_vip_address} - port: 8777 - servers: - - name: ${_param:cluster_node01_hostname} - host: ${_param:cluster_node01_address} - port: 8777 - params: ${_param:haproxy_check} - aodh-api: - type: openstack-service - service_name: aodh - binds: - - address: ${_param:cluster_vip_address} - port: 8042 - servers: - - name: ctl01 - host: ${_param:cluster_node01_address} - port: 8042 - params: ${_param:haproxy_check} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml deleted file mode 100644 index 00f3b76ab..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/config.yml +++ /dev/null @@ -1,80 +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: - - service.git.client - - system.linux.system.single - - system.linux.system.repo.mcp.salt - - system.salt.master.api - - system.salt.master.pkg - - system.reclass.storage.salt - - system.salt.minion.ca.salt_master - - system.mysql.client.single - - system.reclass.storage.system.openstack_compute_multi -parameters: - _param: - openstack_control_node01_hostname: ctl01 - reclass_data_repository: local - reclass_config_master: ${_param:opnfv_infra_config_pxe_address} - salt_master_environment_repository: "https://github.com/tcpcloud" - salt_master_environment_revision: master - single_address: ${_param:opnfv_infra_config_address} - salt_master_host: 127.0.0.1 - salt_master_base_environment: prd - salt_minion_ca_host: ${linux:network:fqdn} - # yamllint disable-line rule:line-length - salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1" - linux: - network: - interface: - dhcp: - enabled: true - type: eth - proto: dhcp - name: ${_param:opnfv_fn_vm_primary_interface} - single_int: - enabled: true - name: ${_param:opnfv_fn_vm_secondary_interface} - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - pxe: - enabled: true - type: eth - proto: static - name: ${_param:opnfv_fn_vm_tertiary_interface} - address: ${_param:opnfv_infra_config_pxe_address} - netmask: 255.255.255.0 - salt: - master: - file_recv: true - reclass: - storage: - data_source: - engine: local - node: - openstack_control_node01: - name: ${_param:openstack_control_node01_hostname} - domain: ${_param:cluster_domain} - classes: - - cluster.${_param:cluster_name}.openstack.control - params: - linux_system_codename: xenial - salt_master_host: ${_param:reclass_config_master} - single_address: ${_param:openstack_control_node01_address} - openstack_compute_node01: - params: - single_address: ${_param:opnfv_openstack_compute_node01_control_address} - tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address} - external_address: ${_param:opnfv_openstack_compute_node01_external_address} - openstack_compute_node02: - params: - single_address: ${_param:opnfv_openstack_compute_node02_control_address} - tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address} - external_address: ${_param:opnfv_openstack_compute_node02_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml deleted file mode 100644 index ede41940a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/infra/init.yml +++ /dev/null @@ -1,29 +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 -############################################################################## ---- -parameters: - _param: - cluster_domain: ${_param:cluster_name}.local - linux: - system: - apt: - config: - prefer_ipv4: - Acquire::ForceIPv4: true - network: - host: - cfg01: - address: ${_param:infra_config_address} - names: - - cfg01 - - cfg01.${_param:cluster_domain} - cfg: - address: ${_param:infra_config_address} - names: - - cfg - - cfg.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml deleted file mode 100644 index 69aba92ad..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/init_options.yml +++ /dev/null @@ -1,28 +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.all-mcp-arch-common -parameters: - _param: - # infra service addresses - infra_config_address: ${_param:opnfv_infra_config_address} - # openstack service addresses - openstack_control_address: ${_param:opnfv_openstack_control_node01_address} - openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address} - openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address} - openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address} - openstack_database_address: ${_param:openstack_control_address} - openstack_message_queue_address: ${_param:openstack_control_address} - openstack_message_queue_node01_address: ${_param:openstack_control_node01_address} - openstack_message_queue_node02_address: ${_param:openstack_control_node02_address} - openstack_message_queue_node03_address: ${_param:openstack_control_node03_address} - openstack_gateway_address: ${_param:opnfv_openstack_gateway_node01_address} - control_address: ${_param:openstack_control_address} - ntp_strata_host1: 1.se.pool.ntp.org - ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml deleted file mode 100644 index 8b6a74d7a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute.yml +++ /dev/null @@ -1,70 +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: - - service.nfs.client - - system.nova.compute.single - - service.cinder.volume.single - - system.cinder.volume.backend.lvm - - system.ceilometer.agent.cluster - - system.ceilometer.client.nova_compute - - system.ceilometer.client.cinder_volume - - system.ceilometer.agent.polling.default - - system.linux.system.repo.mcp.openstack - - cluster.mcp-pike-common-noha.openstack_compute_pdf -parameters: - _param: - interface_mtu: 9000 - linux_system_codename: xenial - ~cinder_lvm_devices: ['/dev/vdb'] - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd - disk_cachemodes: file=directsync,block=none - vncproxy_url: http://${_param:cluster_vip_address}:6080 - bind: - vnc_address: ${_param:single_address} - network: - region: ${_param:openstack_region} - user: neutron - tenant: service - password: ${_param:keystone_neutron_password} - neutron: - compute: - notification: true - vlan_aware_vms: true - root_helper_daemon: false - agent_mode: ${_param:neutron_compute_agent_mode} - message_queue: - host: ${_param:openstack_control_address} - metadata: - host: ${_param:openstack_control_address} - cinder: - volume: - database: - host: ${_param:cluster_local_address} - identity: - host: ${_param:cluster_local_address} - glance: - host: ${_param:cluster_local_address} - message_queue: - host: ${_param:cluster_local_address} - nfs: - client: - mount: - nfs: - path: /var/lib/nova/instances - fstype: nfs - device: ${_param:openstack_control_address}:/srv/nova/instances - linux: - system: - kernel: - sysctl: - vm.dirty_ratio: 10 - vm.dirty_background_ratio: 5 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2 deleted file mode 100644 index 64af148fd..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_compute_pdf.yml.j2 +++ /dev/null @@ -1,44 +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 -############################################################################## -{#- NOTE: br-{mgmt,ctl} are cross-referenced, careful when changing names #} -{%- import 'net_map.j2' as nm with context %} ---- -parameters: - _param: - primary_interface: {{ nm.cmp001.nic_mgmt }} - tenant_interface: {{ nm.cmp001.nic_private }} - external_interface: {{ nm.cmp001.nic_public }} - linux: - network: - bridge: openvswitch - interface: - dhcp_int: - enabled: true - name: {{ nm.cmp001.nic_admin }} - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:primary_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml deleted file mode 100644 index 29b2d627e..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +++ /dev/null @@ -1,151 +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: - - system.linux.system.lowmem - - system.linux.system.repo.mcp.openstack - - service.nfs.server - - system.ceilometer.client - - system.ceilometer.client.neutron - - system.memcached.server.single - - system.rabbitmq.server.single - - system.rabbitmq.server.vhost.openstack - - system.keystone.server.wsgi - - system.keystone.server.single - - system.keystone.client.single - - system.keystone.client.service.nova21 - - system.keystone.client.service.nova-placement - - system.keystone.client.service.cinder3 - - system.keystone.client.service.ceilometer - - system.keystone.client.service.aodh - - system.keystone.client.service.gnocchi - - system.keystone.client.service.panko - - system.glance.control.single - - system.nova.control.single - - system.cinder.control.single - - system.cinder.control.backend.lvm - - system.heat.server.single - - service.mysql.server.single - - system.galera.server.database.cinder - - system.galera.server.database.glance - - system.galera.server.database.grafana - - system.galera.server.database.heat - - system.galera.server.database.keystone - - system.galera.server.database.nova - - system.galera.server.database.ceilometer - - system.galera.server.database.aodh - - system.galera.server.database.gnocchi - - system.galera.server.database.panko - - service.redis.server.single - - service.ceilometer.server.single - - system.ceilometer.server.coordination.redis - - system.ceilometer.server.backend.default - - system.aodh.server.single - - system.aodh.server.coordination.redis - - system.gnocchi.server.single - - system.gnocchi.common.storage.incoming.redis - - system.gnocchi.common.storage.redis - - system.gnocchi.common.coordination.redis - - service.panko.server.single - - system.apache.server.site.gnocchi - - system.apache.server.site.panko - - system.horizon.server.single - - service.haproxy.proxy.single - - cluster.mcp-pike-common-noha.haproxy_openstack_api - - cluster.mcp-pike-common-noha.openstack_control_pdf -parameters: - _param: - linux_system_codename: xenial - ceilometer_create_gnocchi_resources: 'True' - linux: - system: - package: - python-msgpack: - version: latest - keystone: - server: - admin_email: ${_param:admin_email} - openrc_extra: - volume_device_name: vdc - pkgs: - - keystone - - python-psycopg2 - - python-mysqldb - - python-openstackclient - glance: - server: - storage: - engine: file - images: [] - workers: 1 - nova: - controller: - networking: dvr - cpu_allocation: 54 - metadata: - password: ${_param:metadata_password} - bind: - private_address: ${_param:cluster_local_address} - public_address: ${_param:cluster_vip_address} - novncproxy_port: 6080 - vncproxy_url: http://${_param:cluster_vip_address}:6080 - workers: 1 - horizon: - server: - # yamllint disable-line rule:truthy - secure: False - heat: - server: - bind: - api_cfn: - address: ${_param:single_address} - api_cloudwatch: - address: ${_param:single_address} - mysql: - server: - version: '5.7' - bind: - address: ${_param:cluster_local_address} - key_buffer: 8 - max_allowed_packet: 128 - max_connections: 2048 - thread_stack: 512 - thread_cache_size: 12 - query_cache_limit: 2 - query_cache_size: 0 - ceilometer: - server: - ~database: ~ - redis: - server: - version: 3.0 - appendfsync: 'no' - bind: - address: ${_param:single_address} - nfs: - server: - share: - nova_instances: - path: /srv/nova/instances - host: - nova: - host: ${_param:single_address}/24 - params: - - rw - - no_root_squash - - async - neutron: - server: - vlan_aware_vms: true - root_helper_daemon: false - apache: - server: - site: - gnocchi: - wsgi: - threads: 1 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2 deleted file mode 100644 index 8219637dc..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control_pdf.yml.j2 +++ /dev/null @@ -1,32 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -parameters: - linux: - network: - interface: - dhcp_int: - enabled: true - name: {{ nm.ctl01.nic_admin }} - proto: dhcp - type: eth - single_int: - enabled: true - name: {{ nm.ctl01.nic_mgmt }} - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - public_int: - enabled: true - name: {{ nm.ctl01.nic_public }} - type: eth - proto: static - address: ${_param:cluster_public_host} - netmask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml deleted file mode 100644 index 5edf48c31..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml +++ /dev/null @@ -1,21 +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: - - system.linux.system.repo.mcp.openstack - - cluster.mcp-pike-common-noha.openstack_gateway_pdf -parameters: - _param: - interface_mtu: 9000 - linux_system_codename: xenial - neutron: - gateway: - notification: true - agent_mode: ${_param:neutron_gateway_agent_mode} - vlan_aware_vms: true - root_helper_daemon: false diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 deleted file mode 100644 index 7067d59a4..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway_pdf.yml.j2 +++ /dev/null @@ -1,70 +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 -############################################################################## ---- -{%- import 'net_map.j2' as nm with context %} -parameters: - _param: - primary_interface: {{ nm.ctl01.nic_mgmt }} - tenant_interface: {{ nm.ctl01.nic_private }} - external_interface: {{ nm.ctl01.nic_public }} - linux: - network: - bridge: openvswitch - interface: - dhcp_int: - enabled: true - name: {{ nm.ctl01.nic_admin }} - proto: dhcp - type: eth - mtu: ${_param:interface_mtu} - primary_interface: - enabled: true - name: ${_param:primary_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - tenant_interface: - enabled: true - name: ${_param:tenant_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - br-mgmt: - enabled: true - type: bridge - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 - mtu: ${_param:interface_mtu} - use_interfaces: - - ${_param:primary_interface} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml deleted file mode 100644 index ff99b9b42..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml +++ /dev/null @@ -1,134 +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 -############################################################################## ---- -parameters: - _param: - openstack_version: pike - apt_mk_version: nightly - mcp_repo_version: 1.1 - openstack_region: RegionOne - admin_email: root@localhost - cluster_public_protocol: http - cluster_public_host: ${_param:opnfv_openstack_control_node01_external_address} - neutron_public_protocol: http - neutron_control_dvr: 'False' - neutron_l3_ha: 'False' - neutron_global_physnet_mtu: 1500 - neutron_external_mtu: 1500 - neutron_gateway_dvr: 'False' - neutron_gateway_agent_mode: legacy - neutron_compute_dvr: 'False' - neutron_compute_agent_mode: legacy - neutron_compute_external_access: 'False' - galera_server_cluster_name: openstack_cluster - galera_server_maintenance_password: opnfv_secret - galera_server_admin_password: opnfv_secret - cluster_vip_address: ${_param:cluster_public_host} - cluster_local_address: ${_param:openstack_control_address} - cluster_node01_hostname: ctl01 - cluster_node01_address: ${_param:opnfv_openstack_control_node01_address} - cluster_node02_hostname: ctl02 - cluster_node02_address: ${_param:opnfv_openstack_control_node02_address} - cluster_node03_hostname: ctl03 - cluster_node03_address: ${_param:opnfv_openstack_control_node03_address} - rabbitmq_secret_key: opnfv_secret - rabbitmq_admin_password: opnfv_secret - rabbitmq_openstack_password: opnfv_secret - rabbitmq_cold_password: opnfv_secret - glance_version: ${_param:openstack_version} - glance_service_host: ${_param:cluster_local_address} - keystone_version: ${_param:openstack_version} - keystone_service_host: ${_param:cluster_local_address} - heat_version: ${_param:openstack_version} - heat_service_host: ${_param:cluster_local_address} - heat_domain_admin_password: opnfv_secret - ceilometer_version: ${_param:openstack_version} - ceilometer_service_host: ${_param:cluster_local_address} - ceilometer_database_host: ${_param:cluster_local_address} - cinder_version: ${_param:openstack_version} - cinder_service_host: ${_param:cluster_local_address} - nova_version: ${_param:openstack_version} - nova_service_host: ${_param:cluster_local_address} - nova_vncproxy_url: http://${_param:cluster_vip_address}:8060 - neutron_version: ${_param:openstack_version} - neutron_service_host: ${_param:cluster_local_address} - mysql_admin_user: root - mysql_admin_password: opnfv_secret - mysql_cinder_password: opnfv_secret - mysql_ceilometer_password: opnfv_secret - mysql_glance_password: opnfv_secret - mysql_grafana_password: opnfv_secret - mysql_heat_password: opnfv_secret - mysql_keystone_password: opnfv_secret - mysql_neutron_password: opnfv_secret - mysql_nova_password: opnfv_secret - mysql_aodh_password: opnfv_secret - keystone_service_token: opnfv_secret - keystone_admin_password: opnfv_secret - keystone_ceilometer_password: opnfv_secret - keystone_cinder_password: opnfv_secret - keystone_glance_password: opnfv_secret - keystone_heat_password: opnfv_secret - keystone_keystone_password: opnfv_secret - keystone_neutron_password: opnfv_secret - keystone_nova_password: opnfv_secret - ceilometer_secret_key: opnfv_secret - metadata_password: opnfv_secret - horizon_version: ${_param:openstack_version} - horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e - horizon_identity_host: ${_param:cluster_vip_address} - horizon_identity_encryption: none - horizon_identity_version: 3 - aodh_version: ${_param:openstack_version} - keystone_aodh_password: opnfv_secret - aodh_service_host: ${_param:cluster_local_address} - gnocchi_version: 4.0 - gnocchi_service_host: ${_param:cluster_local_address} - mysql_gnocchi_password: opnfv_secret - keystone_gnocchi_password: opnfv_secret - panko_version: ${_param:openstack_version} - panko_service_host: ${_param:cluster_local_address} - mysql_panko_password: opnfv_secret - keystone_panko_password: opnfv_secret - ceilometer_agent_default_polling_interval: 180 - ceilometer_agent_default_polling_meters: - - "*" - linux: - system: - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah - net.ipv4.tcp_slow_start_after_idle: 0 - net.ipv4.tcp_fin_timeout: 30 - network: - host: - ctl: - address: ${_param:openstack_control_address} - names: - - ctl - - ctl.${_param:cluster_domain} - ctl01: - address: ${_param:openstack_control_node01_address} - names: - - ctl01 - - ctl01.${_param:cluster_domain} - gtw01: - address: ${_param:openstack_gateway_address} - names: - - gtw01 - - gtw01.${_param:cluster_domain} - cmp01: - address: ${_param:opnfv_openstack_compute_node01_control_address} - names: - - cmp01 - - cmp01.${_param:cluster_domain} - cmp02: - address: ${_param:opnfv_openstack_compute_node02_control_address} - names: - - cmp02 - - cmp02.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 deleted file mode 100644 index 46e25fe95..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/config.yml.j2 +++ /dev/null @@ -1,28 +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: - - system.reclass.storage.system.opendaylight_control_single - - system.reclass.storage.system.openstack_gateway_single - - cluster.mcp-pike-common-noha.infra.config - - cluster.mcp-pike-odl-noha - - cluster.all-mcp-arch-common.infra.config{%- if conf.MCP_DPDK_MODE %}_dpdk{%- endif %}_pdf -parameters: - reclass: - storage: - node: - opendaylight_control_node01: - classes: - - cluster.${_param:cluster_name}.opendaylight.control - params: - linux_system_codename: xenial - single_address: ${_param:opendaylight_service_host} - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml deleted file mode 100644 index 1bdcbd225..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/infra/init.yml +++ /dev/null @@ -1,14 +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-noha.infra - -parameters: - _param: - cluster_name: mcp-pike-odl-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml deleted file mode 100644 index d770e7895..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/init.yml +++ /dev/null @@ -1,17 +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: - - system.linux.system.single - - cluster.mcp-pike-common-noha.init_options - - cluster.mcp-pike-odl-noha.infra - - cluster.mcp-pike-odl-noha.openstack - -parameters: - _param: - opendaylight_service_host: ${_param:opnfv_opendaylight_server_node01_single_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml deleted file mode 100644 index 8854fc2bf..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control.yml +++ /dev/null @@ -1,30 +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: - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - service.opendaylight.server.single - - cluster.mcp-pike-odl-noha - - cluster.mcp-pike-odl-noha.opendaylight.control_pdf -parameters: - _param: - linux_system_codename: xenial - opendaylight: - server: - odl_bind_ip: ${_param:single_address} - odl_rest_port: 8282 - java_min_mem: 3g - java_max_mem: 3g - router_enabled: true - karaf_features: - odl_default: - - odl-restconf-all - - odl-aaa-authn - netvirt: - - odl-netvirt-openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 deleted file mode 100644 index fbb7de8b3..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/opendaylight/control_pdf.yml.j2 +++ /dev/null @@ -1,25 +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 -############################################################################## -{%- import 'net_map.j2' as nm with context %} ---- -parameters: - linux: - network: - interface: - dhcp_int: - enabled: true - name: {{ nm.ctl01.nic_admin }} - proto: dhcp - type: eth - single_int: - enabled: true - name: {{ nm.ctl01.nic_mgmt }} - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 deleted file mode 100644 index 12dfdcaa1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/compute.yml.j2 +++ /dev/null @@ -1,72 +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: - - service.neutron.compute.single - - service.neutron.compute.opendaylight.single -{%- if conf.MCP_DPDK_MODE %} - - system.nova.compute.nfv.hugepages - - system.neutron.compute.nfv.dpdk -{%- endif %} - - cluster.mcp-pike-common-noha.openstack_compute - - cluster.mcp-pike-odl-noha -parameters: - linux: - network: - interface: -{%- if conf.MCP_DPDK_MODE %} - dpdk0: - name: ${_param:dpdk0_name} - pci: ${_param:dpdk0_pci} - driver: ${_param:dpdk0_driver} - enabled: true - bridge: br-prv - type: dpdk_ovs_port - n_rxq: ${_param:dpdk0_n_rxq} - br-prv: - enabled: true - type: dpdk_ovs_bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - tenant_interface: - type: dpdk # Not a meaningful type, just match 'dpdk' for filtering -{%- endif %} - external_interface: - enabled: true - type: eth - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: ${_param:opnfv_net_public_mask} - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml deleted file mode 100644 index 4c48d0798..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml +++ /dev/null @@ -1,34 +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: - - system.neutron.control.opendaylight.single - - cluster.mcp-pike-common-noha.openstack_control - - cluster.mcp-pike-odl-noha -parameters: - haproxy: - proxy: - listen: - opendaylight-rest: - type: general-service - service_name: opendaylight - binds: - - address: ${_param:cluster_vip_address} - port: 8282 - servers: - - name: odl01 - host: ${_param:opendaylight_service_host} - port: 8282 - params: ${_param:haproxy_check} - keystone: - server: - openrc_extra: - # For noHA, all public services are available through haproxy on ctl - sdn_controller_ip: ${_param:cluster_vip_address} - sdn_username: admin # Hardcoded to default ODL values for now - sdn_password: admin diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml deleted file mode 100644 index f4f646160..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/gateway.yml +++ /dev/null @@ -1,25 +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-noha.openstack_gateway - - service.neutron.gateway.opendaylight.single - - cluster.mcp-pike-odl-noha -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml deleted file mode 100644 index 2cd3083ff..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/init.yml +++ /dev/null @@ -1,22 +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-noha.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" - opendaylight_router: odl-router_v2 - linux: - network: - host: - odl01: - address: ${_param:opnfv_opendaylight_server_node01_single_address} - names: - - odl01 - - odl01.${_param:cluster_domain} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.yml deleted file mode 100644 index 399ffc21a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/config.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-noha.infra.config - - cluster.mcp-pike-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml deleted file mode 100644 index cf43fa8e3..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/infra/init.yml +++ /dev/null @@ -1,14 +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-noha.infra - -parameters: - _param: - cluster_name: mcp-pike-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml deleted file mode 100644 index b3aa40415..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/init.yml +++ /dev/null @@ -1,13 +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: - - system.linux.system.single - - cluster.mcp-pike-common-noha.init_options - - cluster.mcp-pike-ovn-noha.infra - - cluster.mcp-pike-ovn-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml deleted file mode 100644 index ad8658518..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/compute.yml +++ /dev/null @@ -1,52 +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: - - service.neutron.compute.ovn.single - - cluster.mcp-pike-common-noha.openstack_compute - - cluster.mcp-pike-ovn-noha -parameters: - neutron: - compute: - controller_vip: ${_param:cluster_local_address} - linux: - network: - interface: - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: manual - type: eth - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} - br-floating: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - address: ${_param:external_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:external_interface} - use_ovs_ports: - - float-to-ex diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.yml deleted file mode 100644 index 3d120ca9f..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/control.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: - - system.neutron.control.ovn.single - - cluster.mcp-pike-common-noha.openstack_control - - cluster.mcp-pike-ovn-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml deleted file mode 100644 index 03d46ef91..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-noha/openstack/init.yml +++ /dev/null @@ -1,10 +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-noha.openstack_init diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml deleted file mode 100644 index baf072fd8..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/config.yml +++ /dev/null @@ -1,21 +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: - - system.reclass.storage.system.openstack_gateway_single - - cluster.mcp-pike-common-noha.infra.config - - cluster.mcp-pike-ovs-dpdk-noha - - cluster.all-mcp-arch-common.infra.config_dpdk_pdf -parameters: - reclass: - storage: - node: - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml deleted file mode 100644 index d8cb01596..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/infra/init.yml +++ /dev/null @@ -1,14 +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-noha.infra - -parameters: - _param: - cluster_name: mcp-pike-ovs-dpdk-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml deleted file mode 100644 index 8d3a7a588..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/init.yml +++ /dev/null @@ -1,13 +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: - - system.linux.system.single - - cluster.mcp-pike-common-noha.init_options - - cluster.mcp-pike-ovs-dpdk-noha.infra - - cluster.mcp-pike-ovs-dpdk-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml deleted file mode 100644 index 53ba74592..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/compute.yml +++ /dev/null @@ -1,35 +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: - - system.nova.compute.nfv.hugepages - - system.neutron.compute.nfv.dpdk - - service.neutron.compute.single - - cluster.mcp-pike-common-noha.openstack_compute - - cluster.mcp-pike-ovs-dpdk-noha -parameters: - neutron: - compute: - backend: - tenant_network_types: ${_param:neutron_tenant_network_types} - linux: - network: - interface: - dpdk0: - name: ${_param:dpdk0_name} - pci: ${_param:dpdk0_pci} - driver: ${_param:dpdk0_driver} - enabled: true - bridge: br-prv - type: dpdk_ovs_port - n_rxq: ${_param:dpdk0_n_rxq} - br-prv: - enabled: true - type: dpdk_ovs_bridge - tenant_interface: - type: dpdk # Not a meaningful type, just match 'dpdk' for filtering diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml deleted file mode 100644 index 4be308d0e..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/control.yml +++ /dev/null @@ -1,17 +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: - - system.neutron.control.openvswitch.single - - cluster.mcp-pike-common-noha.openstack_control - - cluster.mcp-pike-ovs-dpdk-noha -parameters: - neutron: - server: - backend: - tenant_vlan_range: ${_param:opnfv_net_tenant_vlan} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml deleted file mode 100644 index e7c077528..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/gateway.yml +++ /dev/null @@ -1,26 +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-noha.openstack_gateway - - service.neutron.gateway.single - - cluster.mcp-pike-ovs-dpdk-noha -parameters: - neutron: - gateway: - backend: - tenant_network_types: ${_param:neutron_tenant_network_types} - linux: - network: - interface: - tenant_interface: - ovs_bridge: br-prv - br-prv: - enabled: true - type: ovs_bridge - mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml deleted file mode 100644 index 9ef4b1b31..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-noha/openstack/init.yml +++ /dev/null @@ -1,13 +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-noha.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vlan" diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml deleted file mode 100644 index 4f7428207..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/config.yml +++ /dev/null @@ -1,21 +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: - - system.reclass.storage.system.openstack_gateway_single - - cluster.mcp-pike-common-noha.infra.config - - cluster.mcp-pike-ovs-noha - - cluster.all-mcp-arch-common.infra.config_pdf -parameters: - reclass: - storage: - node: - openstack_gateway_node01: - params: - tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address} - external_address: ${_param:opnfv_openstack_gateway_node01_external_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml deleted file mode 100644 index 54b50d2a8..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/infra/init.yml +++ /dev/null @@ -1,14 +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-noha.infra - -parameters: - _param: - cluster_name: mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml deleted file mode 100644 index 94267fad4..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/init.yml +++ /dev/null @@ -1,13 +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: - - system.linux.system.single - - cluster.mcp-pike-common-noha.init_options - - cluster.mcp-pike-ovs-noha.infra - - cluster.mcp-pike-ovs-noha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml deleted file mode 100644 index 1a8bbd801..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/compute.yml +++ /dev/null @@ -1,24 +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: - - service.neutron.compute.single - - cluster.mcp-pike-common-noha.openstack_compute - - cluster.mcp-pike-ovs-noha -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.yml deleted file mode 100644 index 9b699b6b1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/control.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: - - system.neutron.control.openvswitch.single - - cluster.mcp-pike-common-noha.openstack_control - - cluster.mcp-pike-ovs-noha diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml deleted file mode 100644 index ff0b79a1f..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/gateway.yml +++ /dev/null @@ -1,25 +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-noha.openstack_gateway - - service.neutron.gateway.single - - cluster.mcp-pike-ovs-noha -parameters: - linux: - network: - interface: - br-mesh: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:tenant_address} - netmask: 255.255.255.0 - use_interfaces: - - ${_param:tenant_interface} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml deleted file mode 100644 index e94c4a00d..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-noha/openstack/init.yml +++ /dev/null @@ -1,13 +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-noha.openstack_init -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system index 198b5b745..3d227a7e3 160000 --- a/mcp/reclass/classes/system +++ b/mcp/reclass/classes/system @@ -1 +1 @@ -Subproject commit 198b5b7459c9f602ded773e966888705d866f6dd +Subproject commit 3d227a7e3be6d3da6a459cc8254637be2228d1fb diff --git a/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml new file mode 100644 index 000000000..4fd327242 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-odl-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.mcp-odl-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-odl-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml new file mode 100644 index 000000000..6ae0367b9 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-ovn-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.mcp-ovn-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovn-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml new file mode 100644 index 000000000..30b61848e --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-ovs-dpdk-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.mcp-ovs-dpdk-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovs-dpdk-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml new file mode 100644 index 000000000..658061b26 --- /dev/null +++ b/mcp/reclass/nodes/cfg01.mcp-ovs-noha.local.yml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +classes: + - cluster.mcp-ovs-noha.infra.config +parameters: + _param: + linux_system_codename: xenial + reclass_data_revision: master + linux: + system: + name: cfg01 + domain: mcp-ovs-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml deleted file mode 100644 index a4a21ba6a..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-odl-noha.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-odl-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-odl-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml deleted file mode 100644 index 0df357a26..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovn-noha.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-ovn-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovn-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml deleted file mode 100644 index 394a9f6b6..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-dpdk-noha.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-ovs-dpdk-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovs-dpdk-noha.local diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml deleted file mode 100644 index 793e7c0d4..000000000 --- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-noha.local.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-ovs-noha.infra.config -parameters: - _param: - linux_system_codename: xenial - reclass_data_revision: master - linux: - system: - name: cfg01 - domain: mcp-pike-ovs-noha.local diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 2224d660a..14581bacb 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -80,9 +80,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END export DEBIAN_FRONTEND=noninteractive echo 'Dpkg::Use-Pty "0";' > /etc/apt/apt.conf.d/90silence-dpkg OLD_DOMAIN=\$(grep -sPzo "id: cfg01\.\K(\S*)" /etc/salt/minion.d/minion.conf) || true - BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \ + BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2017.7 " \ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \ - EXTRA_FORMULAS="nfs panko gnocchi" \ + EXTRA_FORMULAS="nfs panko gnocchi oslo-templates" \ ./salt-master-init.sh salt-key -Ay -- cgit 1.2.3-korg