[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, 59 deletions

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