From a21457cc96a640700736189612261e9bcae3d825 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <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>
---
 .../scenario/os-nosdn-nofeature-novcp-ha.yaml.j2   | 58 ----------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2

(limited to 'mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2')

diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
deleted file mode 100644
index 8a366e9f9..000000000
--- a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
+++ /dev/null
@@ -1,58 +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 %}
-{%- set cluster = {'has_virtual_nodes': False} %}
-{%- for node in conf.nodes %}
-  {%- if not cluster.has_virtual_nodes and node.node.type == 'baremetal' %}
-    {%- do cluster.update({'has_baremetal_nodes': True}) %}
-  {%- endif %}
-{%- endfor %}
----
-cluster:
-  domain: mcp-pike-ovs-novcp-ha.local
-  states:
-{%- if cluster.has_baremetal_nodes %}
-    - maas
-    - baremetal_init
-{%- endif %}
-    - openstack_ha
-    - networks
-virtual:
-  nodes:
-    - cfg01
-{%- if cluster.has_baremetal_nodes %}
-    - mas01
-{%- endif %}
-{#- Most likely, controllers will always have the same type and number (3) #}
-{%- if conf.nodes[nm.ctl01.idx].node.type == 'virtual' %}
-    - kvm01
-    - kvm02
-    - kvm03
-{%- endif %}
-{#- Later, we might have mixed computes here, for hybrid multi-arch testing #}
-{%- if conf.nodes[nm.cmp001.idx].node.type == 'virtual' %}
-    - cmp001
-    - cmp002
-{%- endif %}
-  cfg01:
-    vcpus: 4
-    ram: 6144
-  # Below values are only used when nodes are defined in virtual.nodes above
-  mas01:
-    vcpus: 4
-    ram: 6144
-  # NOTE: We might need to add more RAM here
-  kvm01:
-    vcpus: 4
-    ram: 14336
-  kvm02:
-    vcpus: 4
-    ram: 14336
-  kvm03:
-    vcpus: 4
-    ram: 14336
-- 
cgit 1.2.3-korg