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

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init_novcp.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init_novcp.yml
deleted file mode 100644
index 370dcee10..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init_novcp.yml
+++ /dev/null
@@ -1,234 +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
-
-    # openstack service addresses
-    openstack_proxy_control_address: ${_param:opnfv_openstack_control_address}
-    openstack_proxy_node01_control_address: ${_param:opnfv_openstack_control_node01_address}
-    openstack_proxy_node02_control_address: ${_param:opnfv_openstack_control_node03_address}
-
-    openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
-    openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
-    openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
-
-    openstack_control_address: ${_param:opnfv_openstack_control_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_database_node01_address: ${_param:openstack_control_node01_address}
-    openstack_database_node02_address: ${_param:openstack_control_node02_address}
-    openstack_database_node03_address: ${_param:openstack_control_node03_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_telemetry_address: ${_param:openstack_control_address}
-    openstack_telemetry_node01_address: ${_param:openstack_control_node01_address}
-    openstack_telemetry_node02_address: ${_param:openstack_control_node02_address}
-    openstack_telemetry_node03_address: ${_param:openstack_control_node03_address}
-
-    # OpenStack Compute
-    openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
-    openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
-    openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
-    openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
-    openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
-    openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
-    openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
-    openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
-    openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
-    openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
-    openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
-
-    # openstack service hostnames
-    openstack_proxy_hostname: ${_param:openstack_control_hostname}
-    openstack_proxy_node01_hostname: ${_param:openstack_control_node01_hostname}
-    openstack_proxy_node02_hostname: ${_param:openstack_control_node03_hostname}
-    openstack_control_hostname: kvm
-    openstack_control_node01_hostname: kvm01
-    openstack_control_node02_hostname: kvm02
-    openstack_control_node03_hostname: kvm03
-    openstack_database_hostname: ${_param:openstack_control_hostname}
-    openstack_database_node01_hostname: ${_param:openstack_control_node01_hostname}
-    openstack_database_node02_hostname: ${_param:openstack_control_node02_hostname}
-    openstack_database_node03_hostname: ${_param:openstack_control_node03_hostname}
-    openstack_message_queue_hostname: ${_param:openstack_control_hostname}
-    openstack_message_queue_node01_hostname: ${_param:openstack_control_node01_hostname}
-    openstack_message_queue_node02_hostname: ${_param:openstack_control_node02_hostname}
-    openstack_message_queue_node03_hostname: ${_param:openstack_control_node03_hostname}
-    openstack_telemetry_hostname: ${_param:openstack_control_hostname}
-    openstack_telemetry_node01_hostname: ${_param:openstack_control_node01_hostname}
-    openstack_telemetry_node02_hostname: ${_param:openstack_control_node02_hostname}
-    openstack_telemetry_node03_hostname: ${_param:openstack_control_node03_hostname}
-
-    # openstack compute
-    openstack_compute_node01_hostname: cmp001
-    openstack_compute_node02_hostname: cmp002
-
-    openstack_region: RegionOne
-    admin_email: root@localhost
-    # Neutron osv/nodvr
-    neutron_control_dvr: 'False'
-    neutron_l3_ha: 'True'
-    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: 'True'
-    galera_server_cluster_name: openstack_cluster
-    galera_server_maintenance_password: opnfv_secret
-    galera_server_admin_password: opnfv_secret
-    rabbitmq_secret_key: opnfv_secret
-    rabbitmq_admin_password: opnfv_secret
-    rabbitmq_openstack_password: opnfv_secret
-    glance_version: ${_param:openstack_version}
-    glance_service_host: ${_param:openstack_control_address}
-    keystone_version: ${_param:openstack_version}
-    keystone_service_host: ${_param:openstack_control_address}
-    heat_version: ${_param:openstack_version}
-    heat_service_host: ${_param:openstack_control_address}
-    heat_domain_admin_password: opnfv_secret
-    cinder_version: ${_param:openstack_version}
-    cinder_service_host: ${_param:openstack_control_address}
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: ${_param:openstack_telemetry_address}
-    ceilometer_influxdb_password: opnfv_secret
-    nova_version: ${_param:openstack_version}
-    nova_service_host: ${_param:openstack_control_address}
-    neutron_version: ${_param:openstack_version}
-    neutron_service_host: ${_param:openstack_control_address}
-    glusterfs_service_host: ${_param:openstack_control_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
-    mysql_designate_password: opnfv_secret
-    aodh_version: ${_param:openstack_version}
-    keystone_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
-    keystone_designate_password: opnfv_secret
-    ceilometer_secret_key: opnfv_secret
-    horizon_version: ${_param:openstack_version}
-    horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
-    horizon_identity_host: ${_param:openstack_control_address}
-    horizon_identity_encryption: none
-    horizon_identity_version: 3
-    mongodb_server_replica_set: ceilometer
-    mongodb_ceilometer_password: opnfv_secret
-    mongodb_admin_password: opnfv_secret
-    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
-    metadata_password: opnfv_secret
-    openstack_telemetry_keepalived_password: opnfv_secret
-    aodh_service_host: ${_param:openstack_telemetry_address}
-    designate_service_host: ${_param:openstack_control_address}
-    designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
-    designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
-    designate_pool_ns_records:
-      - hostname: 'ns1.example.org.'
-        priority: 10
-    designate_pool_nameservers:
-      - host: ${_param:openstack_control_node01_address}
-        port: 53
-      - host: ${_param:openstack_control_node02_address}
-        port: 53
-      - host: ${_param:openstack_control_node03_address}
-        port: 53
-    designate_pool_target_type: bind9
-    designate_pool_target_masters:
-      - host: ${_param:openstack_control_node01_address}
-        port: 5354
-      - host: ${_param:openstack_control_node02_address}
-        port: 5354
-      - host: ${_param:openstack_control_node03_address}
-        port: 5354
-    designate_pool_target_options:
-      host: ${_param:openstack_control_node01_address}
-      port: 53
-      rndc_host: ${_param:openstack_control_node01_address}
-      rndc_port: 953
-      rndc_key_file: /etc/designate/rndc.key
-    designate_version: ${_param:openstack_version}
-    # Billing
-    # keystone_billometer_password: opnfv_secret
-    # keystone_billometer_address: ${_param:billometer_service_host}
-    # billometer_service_host: ${_param:openstack_billing_address}
-    # billometer_version: ${_param:openstack_version}
-    # billometer_secret_key: opnfv_secretpasswordpasswordpassword
-    # billometer_identity_password: ${_param:keystone_billometer_password}
-    # billometer_identity_host: ${_param:openstack_control_address}
-    # billometer_identity_token: ${_param:keystone_service_token}
-  linux:
-    system:
-      repo:
-        uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
-          architectures: amd64
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
-      kernel:
-        sysctl:
-          net.ipv4.tcp_congestion_control: yeah
-          net.ipv4.tcp_slow_start_after_idle: 0
-          net.ipv4.tcp_fin_timeout: 30
-    network:
-      host:
-        kvm:
-          address: ${_param:openstack_control_address}
-          names:
-            - ${_param:openstack_control_hostname}
-            - ${_param:openstack_control_hostname}.${_param:cluster_domain}
-        kvm01:
-          address: ${_param:openstack_control_node01_address}
-          names:
-            - ${_param:openstack_control_node01_hostname}
-            - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
-        kvm02:
-          address: ${_param:openstack_control_node02_address}
-          names:
-            - ${_param:openstack_control_node02_hostname}
-            - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
-        kvm03:
-          address: ${_param:openstack_control_node03_address}
-          names:
-            - ${_param:openstack_control_node03_hostname}
-            - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
-        cmp001:
-          address: ${_param:openstack_compute_node01_control_address}
-          names:
-            - ${_param:openstack_compute_node01_hostname}
-            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
-        cmp002:
-          address: ${_param:openstack_compute_node02_control_address}
-          names:
-            - ${_param:openstack_compute_node02_hostname}
-            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}