[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 <mcp/reclass/classes/cluster/.gitignore>
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 <Alexandru.Avadanii@enea.com>

1 files changed, 0 insertions, 144 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_novcp.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_novcp.yml
deleted file mode 100644
index 7ca12f699..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_novcp.yml
+++ /dev/null
@@ -1,144 +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.glusterfs
-  - system.ceilometer.client
-  - system.memcached.server.single
-  - system.keystone.server.cluster
-  - system.keystone.server.wsgi
-  - system.glance.control.cluster
-  - system.nova.control.cluster
-  - system.cinder.control.cluster
-  - system.cinder.control.backend.lvm
-  - system.heat.server.cluster
-  - system.designate.server.cluster
-  - system.designate.server.backend.bind
-  - system.bind.server.single
-  - system.haproxy.proxy.listen.openstack.nova-placement
-  - system.haproxy.proxy.listen.openstack.glare
-  - system.glusterfs.client.cluster
-  - system.glusterfs.client.volume.glance
-  - system.glusterfs.client.volume.keystone
-  # sync from kvm
-  - service.keepalived.cluster.single
-  - system.glusterfs.server.volume.glance
-  - system.glusterfs.server.volume.keystone
-  - system.glusterfs.server.cluster
-  # NOTE(armband): Disabled for novcp
-  # - system.salt.control.virt
-  # - system.salt.control.cluster.openstack_control_cluster
-  # - system.salt.control.cluster.openstack_proxy_cluster
-  # - system.salt.control.cluster.openstack_database_cluster
-  # - system.salt.control.cluster.openstack_message_queue_cluster
-  # - system.salt.control.cluster.openstack_telemetry_cluster
-  # - system.salt.control.cluster.stacklight_server_cluster
-  # - system.salt.control.cluster.stacklight_log_cluster
-  # - system.salt.control.cluster.stacklight_telemetry_cluster
-  - cluster.mcp-pike-common-ha.infra.kvm_pdf
-  - cluster.mcp-pike-common-ha.include.proxy
-parameters:
-  _param:
-    linux_system_codename: xenial  # sync from kvm
-    # For NOVCP, we switch keepalived VIPs, to keep cluster_vip_address in ctl
-    single_nic: br-ctl  # for keepalive_vip_interface interpolation
-    keepalived_vip_interface: ${_param:single_nic}  # sync from kvm
-    keepalived_vip_virtual_router_id: 50
-    keepalived_openstack_web_public_vip_address: ${_param:openstack_proxy_address}
-    keepalived_openstack_web_public_vip_interface: br-ex
-    cluster_vip_address: ${_param:openstack_control_address}
-    cluster_local_address: ${_param:single_address}
-    cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
-    cluster_node01_address: ${_param:openstack_control_node01_address}
-    cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
-    cluster_node02_address: ${_param:openstack_control_node02_address}
-    cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
-    cluster_node03_address: ${_param:openstack_control_node03_address}
-    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
-    glusterfs_version: '3.13'
-  libvirt:
-    server:
-      service: libvirtd
-      config_sys: /etc/default/libvirtd
-      unix_sock_group: libvirt
-  linux:
-    network:
-      remove_iface_files:
-        - '/etc/network/interfaces.d/50-cloud-init.cfg'
-      # Add public IPs here as overrides, no need to fork another kvm_pdf.j2
-      interface:
-        br-ex:
-          address: ${_param:external_address}
-          proto: static
-  neutron:
-    server:
-      vlan_aware_vms: true
-  keystone:
-    server:
-      cacert: /etc/ssl/certs/mcp_os_cacert
-  bind:
-    server:
-      control:
-        mgmt:
-          enabled: true
-          bind:
-            address: ${_param:single_address}
-            port: 953
-          allow:
-            - ${_param:openstack_control_node01_address}
-            - ${_param:openstack_control_node02_address}
-            - ${_param:openstack_control_node03_address}
-          keys:
-            - designate
-  designate:
-    server:
-      pools:
-        default:
-          description: 'test pool'
-          targets:
-            default:
-              description: 'test target1'
-            default1:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target2'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node02_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node02_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-            default2:
-              type: ${_param:designate_pool_target_type}
-              description: 'test target3'
-              masters: ${_param:designate_pool_target_masters}
-              options:
-                host: ${_param:openstack_control_node03_address}
-                port: 53
-                rndc_host: ${_param:openstack_control_node03_address}
-                rndc_port: 953
-                rndc_key_file: /etc/designate/rndc.key
-  # sync from common-ha kvm role
-  glusterfs:
-    server:
-      service: glusterd
-      volumes:
-        nova_instances:
-          storage: /srv/glusterfs/nova_instances
-          replica: 3
-          bricks:
-            - ${_param:cluster_node01_address}:/srv/glusterfs/nova_instances
-            - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
-            - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
-          options:
-            cluster.readdir-optimize: 'True'
-            nfs.disable: 'True'
-            network.remote-dio: 'True'
-            cluster.favorite-child-policy: mtime
-            diagnostics.client-log-level: WARNING
-            diagnostics.brick-log-level: WARNING