From a21457cc96a640700736189612261e9bcae3d825 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Feb 2018 19:01:56 +0100 Subject: [novcp] Add deploy argument `-N` (experimental) Instead of duplicating scenarios for NOVCP, allow it to be specified using a new deploy argument, `-N`. Things are getting convoluted, so instead of creating dedicated '*_pdf.yml.j2' files for each group of similar features, apply the templating in-place and rename all affected files to ".yml.j2". This breaks .gitignore assumption of hiding only "*_pdf.yml" files, so extend (manually) the with `git ls-files --exclude-standard -o` after an expansion. - ha: move nfv.cpu_pinning to j2, conditioned by 'baremetal'; - ha: add cmp00* vnode definitions (hugepages need more RAM); - labs/local: enable hugepage params for non-dpdk noha; - salt.sh: add route_wrapper to all non-infra VMs; This change extends novcp support to all HA scenarios. Change-Id: I7a80415ac33367ab227ececb4ffb1bc026546d36 Signed-off-by: Alexandru Avadanii --- .../cluster/mcp-pike-ovs-novcp-ha/infra/config.yml | 25 --------- .../cluster/mcp-pike-ovs-novcp-ha/infra/init.yml | 18 ------- .../cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml | 12 ----- .../cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml | 11 ---- .../classes/cluster/mcp-pike-ovs-novcp-ha/init.yml | 12 ----- .../mcp-pike-ovs-novcp-ha/openstack/compute.yml | 17 ------- .../openstack/compute_pdf.yml.j2 | 1 - .../mcp-pike-ovs-novcp-ha/openstack/control.yml | 19 ------- .../mcp-pike-ovs-novcp-ha/openstack/database.yml | 10 ---- .../mcp-pike-ovs-novcp-ha/openstack/init.yml | 19 ------- .../openstack/message_queue.yml | 10 ---- .../mcp-pike-ovs-novcp-ha/openstack/proxy.yml | 59 ---------------------- .../mcp-pike-ovs-novcp-ha/openstack/telemetry.yml | 10 ---- 13 files changed, 223 deletions(-) delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml delete mode 120000 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha') diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml deleted file mode 100644 index 9fe92d6bd..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.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-ha.infra.config - - cluster.mcp-pike-ovs-novcp-ha.infra - - cluster.all-mcp-arch-common.infra.config_pdf -parameters: - reclass: - storage: - node: - openstack_control_node01: # openstack_proxy_node01 - params: - external_address: ${_param:openstack_proxy_node01_address} - openstack_control_node02: # no proxy role - params: - external_address: 0.0.0.0 - openstack_control_node03: # openstack_proxy_node02 - params: - external_address: ${_param:openstack_proxy_node02_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml deleted file mode 100644 index 23c299cbc..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.infra - - cluster.mcp-pike-ovs-novcp-ha.openstack -parameters: - _param: - cluster_name: mcp-pike-ovs-novcp-ha - # For NOVCP, we override kvm addresses to overlap with ctl - infra_kvm_node01_address: ${_param:openstack_control_node01_address} - infra_kvm_node02_address: ${_param:openstack_control_node02_address} - infra_kvm_node03_address: ${_param:openstack_control_node03_address} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml deleted file mode 100644 index 887af029d..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.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 -############################################################################## ---- -# NOTE(armband): we don't want to pull in salt.control for novcp -# classes: -# - cluster.mcp-pike-common-ha.infra.kvm -# - cluster.mcp-pike-ovs-novcp-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml deleted file mode 100644 index e694679b9..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml +++ /dev/null @@ -1,11 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.infra.maas - - cluster.mcp-pike-ovs-novcp-ha.infra diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml deleted file mode 100644 index 234418d9c..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.all-mcp-arch-common - - cluster.mcp-pike-ovs-novcp-ha.infra - - cluster.mcp-pike-ovs-novcp-ha.openstack diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml deleted file mode 100644 index afe1cc5a6..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.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: - - cluster.mcp-pike-common-ha.openstack_compute - - cluster.mcp-pike-ovs-novcp-ha.openstack.compute_pdf - - cluster.mcp-pike-ovs-novcp-ha.infra -parameters: - nova: - compute: - libvirt_service: libvirtd - libvirt_bin: /etc/default/libvirtd diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 deleted file mode 120000 index d43451a2a..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 +++ /dev/null @@ -1 +0,0 @@ -../../mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 \ No newline at end of file diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml deleted file mode 100644 index 4cd5b9629..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml +++ /dev/null @@ -1,19 +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.cluster - - cluster.mcp-pike-common-ha.openstack_control_novcp - - cluster.mcp-pike-ovs-novcp-ha -parameters: - apache: - server: - modules: - # NOTE(armband): We first override mods to ~, then to this to drop ssl - - rewrite - - wsgi diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml deleted file mode 100644 index 163769524..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.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-ha.openstack_database diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml deleted file mode 100644 index 2bacdfca1..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_init_novcp -parameters: - _param: - neutron_tenant_network_types: "flat,vxlan" - apache: - server: - # NOTE(armband): override these to ~ first, so we can later drop ssl/443 - bind: - ports: ~ - modules: ~ diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml deleted file mode 100644 index 0fd4a8a54..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.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-ha.openstack_message_queue diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml deleted file mode 100644 index 89b095430..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml +++ /dev/null @@ -1,59 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- -classes: - - cluster.mcp-pike-common-ha.openstack_proxy - - system.keepalived.cluster.instance.openstack_web_public_vip -parameters: - linux: - # Set up routes similar to prx*ovs-ha - network: - interface: - br-ex: - route: - public: - address: 0.0.0.0 - netmask: 0.0.0.0 - gateway: ${_param:opnfv_net_public_gw} - nginx: - server: - # NOTE(armband): Define host.address for all proxies for uniformity - site: - nginx_proxy_novnc: &nginx_openstack_proxy_address - host: - address: ${_param:openstack_proxy_address} - nginx_proxy_openstack_api_aodh: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_ceilometer: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_cinder: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_glance: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_heat: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_heat_cfn: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_heat_cloudwatch: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_keystone: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_keystone_private: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_neutron: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_nova: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_api_nova_ec2: - <<: *nginx_openstack_proxy_address - nginx_proxy_openstack_web: - <<: *nginx_openstack_proxy_address - nginx_ssl_redirect_openstack_web: - <<: *nginx_openstack_proxy_address - nginx_static_reclass_doc: - <<: *nginx_openstack_proxy_address diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml deleted file mode 100644 index 1cb72ac5c..000000000 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.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-ha.openstack_telemetry -- cgit 1.2.3-korg