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>
---
 .../cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2  | 12 ++++++++
 .../classes/cluster/mcp-pike-odl-ha/infra/kvm.yml  | 29 --------------------
 .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2       | 32 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2
 delete mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
 create mode 100644 mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2

(limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra')

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2
new file mode 100644
index 000000000..385326561
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/init_vcp.yml.j2
@@ -0,0 +1,12 @@
+##############################################################################
+# 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
+##############################################################################
+---
+{%- if conf.MCP_VCP %}
+classes:
+  - cluster.mcp-pike-odl-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
deleted file mode 100644
index e2b18e4da..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
+++ /dev/null
@@ -1,29 +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.kvm
-  - cluster.mcp-pike-odl-ha.infra
-parameters:
-  salt:
-    control:
-      size:  # RAM 4096,8192,16384,32768,65536
-        # Default production sizing
-        opendaylight.server:
-          cpu: 4
-          ram: 6144
-          disk_profile: small
-          net_profile: default
-      cluster:
-        internal:
-          node:
-            odl01:
-              name: ${_param:opendaylight_server_node01_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_xenial_image}
-              size: opendaylight.server
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
new file mode 100644
index 000000000..81135d6a9
--- /dev/null
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
@@ -0,0 +1,32 @@
+##############################################################################
+# 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
+##############################################################################
+---
+{%- if conf.MCP_VCP %}
+# NOTE(armband): we don't want to pull in salt.control for novcp
+classes:
+  - cluster.mcp-pike-common-ha.infra.kvm
+  - cluster.mcp-pike-odl-ha.infra
+parameters:
+  salt:
+    control:
+      size:  # RAM 4096,8192,16384,32768,65536
+        # Default production sizing
+        opendaylight.server:
+          cpu: 4
+          ram: 6144
+          disk_profile: small
+          net_profile: default
+      cluster:
+        internal:
+          node:
+            odl01:
+              name: ${_param:opendaylight_server_node01_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              size: opendaylight.server
+{%- endif %}
-- 
cgit 1.2.3-korg