From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 19 Feb 2018 18:01:56 +0000 (+0100)
Subject: [NOVCP] Add deploy argument `-N` (experimental)
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F52339%2F8;p=fuel.git

[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 change extends novcp support to all HA scenarios.

Change-Id: I7a80415ac33367ab227ececb4ffb1bc026546d36
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index c883616f1..c35eb9a8e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # shellcheck disable=SC2034,SC2154,SC1090,SC1091
 ##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea AB and others.
 # jonas.bjurel@ericsson.com
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -38,7 +38,7 @@ $(notify "USAGE:" 2)
   $(basename "$0") -l lab-name -p pod-name -s deploy-scenario \\
     [-b Lab Config Base URI] \\
     [-S storage-dir] [-L /path/to/log/file.tar.gz] \\
-    [-f[f]] [-F] [-e | -E[E]] [-d] [-D]
+    [-f[f]] [-F] [-e | -E[E]] [-d] [-D] [-N]
 
 $(notify "OPTIONS:" 2)
   -b  Base-uri for the stack-configuration structure
@@ -55,6 +55,7 @@ $(notify "OPTIONS:" 2)
   -s  Deploy-scenario short-name
   -S  Storage dir for VM images
   -L  Deployment log path and file name
+  -N  Experimental: Do not virtualize control plane (novcp)
 
 $(notify_i "Description:" 2)
 Deploys the Fuel@OPNFV stack on the indicated lab resource.
@@ -90,6 +91,8 @@ $(notify_i "Input parameters to the build script are:" 2)
 -L Deployment log path and name, eg. -L /home/jenkins/job.log.tar.gz
 -l Lab name as defined in the configuration directory, e.g. lf
 -p POD name as defined in the configuration directory, e.g. pod2
+-N Experimental: Instead of virtualizing the control plane (VCP), deploy
+   control plane directly on baremetal nodes
 -P Skip installing dependency distro packages on current host
    This flag should only be used if you have kept back older packages that
    would be upgraded and that is undesirable on the current system.
@@ -132,6 +135,7 @@ USE_EXISTING_INFRA=${USE_EXISTING_INFRA:-0}
 INFRA_CREATION_ONLY=${INFRA_CREATION_ONLY:-0}
 NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0}
 ERASE_ENV=${ERASE_ENV:-0}
+MCP_VCP=${MCP_VCP:-1}
 
 source "${DEPLOY_DIR}/globals.sh"
 source "${DEPLOY_DIR}/lib.sh"
@@ -144,7 +148,7 @@ source "${DEPLOY_DIR}/lib.sh"
 # BEGIN of main
 #
 set +x
-while getopts "b:dDfEFl:L:p:Ps:S:he" OPTION
+while getopts "b:dDfEFl:L:Np:Ps:S:he" OPTION
 do
     case $OPTION in
         b)
@@ -179,6 +183,9 @@ do
         L)
             DEPLOY_LOG="${OPTARG}"
             ;;
+        N)
+            MCP_VCP=0
+            ;;
         p)
             TARGET_POD=${OPTARG}
             if [[ "${TARGET_POD}" =~ virtual ]]; then
@@ -261,6 +268,7 @@ fi
 make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import
 
 # Expand scenario files, pod_config based on PDF
+export MCP_VCP
 SCENARIO_DIR="$(readlink -f "../config/scenario")"
 do_templates "${REPO_ROOT_PATH}" "${STORAGE_DIR}" "${TARGET_LAB}" \
              "${TARGET_POD}" "${BASE_CONFIG_URI}" "${SCENARIO_DIR}"
diff --git a/mcp/config/scenario/.gitignore b/mcp/config/scenario/.gitignore
index 14e9ab880..46c7f92c8 100644
--- a/mcp/config/scenario/.gitignore
+++ b/mcp/config/scenario/.gitignore
@@ -1 +1 @@
-os-nosdn-nofeature-novcp-ha.yaml
+*-ha.yaml
diff --git a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml
deleted file mode 100644
index 547bc2972..000000000
--- a/mcp/config/scenario/os-nosdn-nofeature-ha.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
----
-cluster:
-  domain: mcp-pike-ovs-ha.local
-  states:
-    - maas
-    - baremetal_init
-    - virtual_control_plane
-    - openstack_ha
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - mas01
-  cfg01:
-    vcpus: 4
-    ram: 6144
-  mas01:
-    vcpus: 4
-    ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
similarity index 94%
rename from mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
rename to mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
index 2dfea5f60..11eb0ed9a 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-ha.yaml.j2
@@ -14,11 +14,14 @@
 {%- endfor %}
 ---
 cluster:
-  domain: mcp-pike-ovs-novcp-ha.local
+  domain: mcp-pike-ovs-ha.local
   states:
 {%- if cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
+{%- endif %}
+{%- if conf.MCP_VCP %}
+    - virtual_control_plane
 {%- endif %}
     - openstack_ha
     - networks
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml
deleted file mode 100644
index a7ecba7fc..000000000
--- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
----
-cluster:
-  domain: mcp-pike-ovs-dpdk-ha.local
-  states:
-    - maas
-    - baremetal_init
-    - virtual_control_plane
-    - dpdk
-    - openstack_ha
-    - networks
-    - networking_gw
-virtual:
-  nodes:
-    - cfg01
-    - mas01
-  cfg01:
-    vcpus: 4
-    ram: 6144
-  mas01:
-    vcpus: 4
-    ram: 6144
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
new file mode 100644
index 000000000..482911074
--- /dev/null
+++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml.j2
@@ -0,0 +1,63 @@
+##############################################################################
+# 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' %}
+    {%- set _ = cluster.update({'has_baremetal_nodes': True}) %}
+  {%- endif %}
+{%- endfor %}
+---
+cluster:
+  domain: mcp-pike-ovs-dpdk-ha.local
+  states:
+{%- if cluster.has_baremetal_nodes %}
+    - maas
+    - baremetal_init
+{%- endif %}
+{%- if conf.MCP_VCP %}
+    - virtual_control_plane
+{%- endif %}
+    - dpdk
+    - openstack_ha
+    - networks
+    - networking_gw
+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
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml b/mcp/config/scenario/os-odl-nofeature-ha.yaml
deleted file mode 100644
index 7cf1033a4..000000000
--- a/mcp/config/scenario/os-odl-nofeature-ha.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
----
-cluster:
-  domain: mcp-pike-odl-ha.local
-  states:
-    - maas
-    - baremetal_init
-    - virtual_control_plane
-    - opendaylight
-    - openstack_ha
-    - networks
-virtual:
-  nodes:
-    - cfg01
-    - mas01
-  cfg01:
-    vcpus: 4
-    ram: 6144
-  mas01:
-    vcpus: 4
-    ram: 6144
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
new file mode 100644
index 000000000..e552b3f77
--- /dev/null
+++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2
@@ -0,0 +1,62 @@
+##############################################################################
+# 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' %}
+    {%- set _ = cluster.update({'has_baremetal_nodes': True}) %}
+  {%- endif %}
+{%- endfor %}
+---
+cluster:
+  domain: mcp-pike-odl-ha.local
+  states:
+{%- if cluster.has_baremetal_nodes %}
+    - maas
+    - baremetal_init
+{%- endif %}
+{%- if conf.MCP_VCP %}
+    - virtual_control_plane
+{%- endif %}
+    - opendaylight
+    - 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
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
index 8a87d1a3c..bd75e7b72 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/config.yml
@@ -120,12 +120,16 @@ parameters:
             - cluster.mcp-pike-common-ha.openstack_control_init
           params:
             linux_system_codename: xenial
+            # NOTE: When VCP is present, external_address is not used
+            external_address: ${_param:openstack_proxy_node01_address}
         openstack_control_node02:
           params:
             linux_system_codename: xenial
+            external_address: 0.0.0.0
         openstack_control_node03:
           params:
             linux_system_codename: xenial
+            external_address: ${_param:openstack_proxy_node02_address}
         openstack_database_node01:
           classes:
             - cluster.mcp-pike-common-ha.openstack_database_init
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
similarity index 92%
rename from mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
index acacd2151..7f3839e82 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/init.yml.j2
@@ -31,9 +31,16 @@ parameters:
     infra_maas_node01_deploy_address: ${_param:opnfv_infra_maas_node01_deploy_address}
 
     infra_kvm_address: ${_param:opnfv_infra_kvm_address}
+{%- if conf.MCP_VCP %}
     infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
     infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
     infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
+{%- else %}
+    # For NOVCP, we override kvm addresses to overlap with ctl
+    infra_kvm_node01_address: ${_param:openstack_control_node01_address}
+    infra_kvm_node02_address: ${_param:openstack_control_node02_address}
+    infra_kvm_node03_address: ${_param:openstack_control_node03_address}
+{%- endif %}
 
     infra_maas_node01_hostname: mas01
     infra_kvm_node01_hostname: kvm01
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
index 7ca12f699..89f382239 100644
--- 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
@@ -41,7 +41,8 @@ classes:
   # - 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
+  - cluster.mcp-pike-common-ha.include.maas_proxy
+  - cluster.mcp-pike-common-ha.include.lab_proxy_pdf
 parameters:
   _param:
     linux_system_codename: xenial  # sync from kvm
@@ -68,8 +69,6 @@ parameters:
       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:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
index d2d611c6f..be6082e12 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml
@@ -76,6 +76,10 @@ parameters:
     openstack_compute_node01_hostname: cmp001
     openstack_compute_node02_hostname: cmp002
 
+    # opendaylight options
+    opendaylight_server_node01_hostname: odl01
+    opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
+
     openstack_region: RegionOne
     admin_email: root@localhost
     # Neutron osv/nodvr
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
index 370dcee10..e90c4e743 100644
--- 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
@@ -78,6 +78,11 @@ parameters:
     openstack_compute_node01_hostname: cmp001
     openstack_compute_node02_hostname: cmp002
 
+    # opendaylight options
+    opendaylight_control_hostname: ${_param:openstack_control_node02_hostname}
+    opendaylight_server_node01_hostname: ${_param:opendaylight_control_hostname}
+    opendaylight_server_node01_single_address: ${_param:opnfv_openstack_control_node02_address}
+
     openstack_region: RegionOne
     admin_email: root@localhost
     # Neutron osv/nodvr
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.j2
similarity index 91%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
index e2b18e4da..81135d6a9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/kvm.yml.j2
@@ -6,6 +6,8 @@
 # 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
@@ -27,3 +29,4 @@ parameters:
               provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: opendaylight.server
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2
similarity index 96%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2
index bda11aa88..1a544d4c7 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/opendaylight/control.yml.j2
@@ -8,8 +8,10 @@
 ---
 classes:
   - system.opendaylight.server.single
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-pike-odl-ha
+{%- endif %}
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml.j2
similarity index 70%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml.j2
index ebfb2e1be..193f272a3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml.j2
@@ -8,11 +8,24 @@
 ---
 classes:
   - system.neutron.control.opendaylight.cluster
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-pike-common-ha.openstack_control
   - cluster.mcp-pike-odl-ha.infra
+{%- else %}
+  - cluster.mcp-pike-common-ha.openstack_control_novcp
+  - cluster.mcp-pike-odl-ha
+{%- endif %}
 parameters:
   neutron:
     server:
       backend:
         router: ${_param:opendaylight_router}
+{%- if not conf.MCP_VCP %}
+  apache:
+    server:
+      modules:
+        # NOTE(armband): We first override mods to ~, then to this to drop ssl
+        - rewrite
+        - wsgi
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml.j2
index c6a28c3bc..d90f46a67 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/database.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_database
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-odl-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2
similarity index 80%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2
index acf6c113a..3ddc07431 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/init.yml.j2
@@ -7,13 +7,15 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_init
+{%- else %}
+  - cluster.mcp-pike-common-ha.openstack_init_novcp
+{%- endif %}
 parameters:
   _param:
     # opendaylight options
-    opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
     opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
-    opendaylight_server_node01_hostname: odl01
     opendaylight_router: odl-router_v2
 
     neutron_tenant_network_types: "flat,vxlan"
@@ -22,6 +24,7 @@ parameters:
     compute_hugepages_count: 16
     compute_hugepages_mount: /mnt/hugepages_1G
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+{%- if conf.MCP_VCP %}
   linux:
     network:
       host:
@@ -30,3 +33,11 @@ parameters:
           names:
             - ${_param:opendaylight_server_node01_hostname}
             - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain}
+{%- else %}
+  apache:
+    server:
+      # NOTE(armband): override these to ~ first, so we can later drop ssl/443
+      bind:
+        ports: ~
+      modules: ~
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml.j2
index 13596155c..7a65ba72b 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/message_queue.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_message_queue
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-odl-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml.j2
similarity index 90%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml.j2
index e2040aa3a..1e675d48a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/proxy.yml.j2
@@ -7,9 +7,13 @@
 ##############################################################################
 ---
 classes:
-  - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+{%- if conf.MCP_VCP %}
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_proxy
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-odl-ha.infra
+{%- endif %}
 parameters:
   nginx:
     server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml.j2
index 13e6ef6d4..62dded5e9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/telemetry.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_telemetry
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-odl-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2
similarity index 84%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2
index 73a3c95ba..b62118d4a 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/infra/kvm.yml.j2
@@ -6,6 +6,9 @@
 # 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-ovs-dpdk-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml.j2
similarity index 70%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml.j2
index e0423c33b..8fd8e8bc6 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/control.yml.j2
@@ -8,11 +8,24 @@
 ---
 classes:
   - system.neutron.control.openvswitch.cluster
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
   - cluster.mcp-pike-common-ha.openstack_control
   - cluster.mcp-pike-ovs-dpdk-ha.infra
+{%- else %}
+  - cluster.mcp-pike-common-ha.openstack_control_novcp
+  - cluster.mcp-pike-ovs-dpdk-ha
+{%- endif %}
 parameters:
   neutron:
     server:
       backend:
         tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
+{%- if not conf.MCP_VCP %}
+  apache:
+    server:
+      modules:
+        # NOTE(armband): We first override mods to ~, then to this to drop ssl
+        - rewrite
+        - wsgi
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml.j2
index 5db1ccdb1..5739b3819 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/database.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_database
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-dpdk-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml.j2
similarity index 77%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml.j2
index 4d3e9cf6e..1c0960c76 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/init.yml.j2
@@ -7,7 +7,11 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_init
+{%- else %}
+  - cluster.mcp-pike-common-ha.openstack_init_novcp
+{%- endif %}
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
@@ -22,3 +26,11 @@ parameters:
     compute_ovs_dpdk_socket_mem: "2048,2048"
     compute_ovs_dpdk_lcore_mask: "0x8"
     compute_ovs_memory_channels: "2"
+{%- if not conf.MCP_VCP %}
+  apache:
+    server:
+      # NOTE(armband): override these to ~ first, so we can later drop ssl/443
+      bind:
+        ports: ~
+      modules: ~
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml.j2
index c05e16b18..1d1db6511 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/message_queue.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_message_queue
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-dpdk-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml.j2
index 3fc77ec98..a404dcfd8 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/proxy.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_proxy
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-dpdk-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml.j2
index 1946d728a..db6805cb6 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/telemetry.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_telemetry
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-dpdk-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2
similarity index 84%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2
index 5a44e715a..0d49e5d10 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/infra/kvm.yml.j2
@@ -6,6 +6,9 @@
 # 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-ovs-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml
deleted file mode 100644
index a70a8a07f..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml
+++ /dev/null
@@ -1,13 +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.neutron.control.openvswitch.cluster
-  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
-  - cluster.mcp-pike-common-ha.openstack_control
-  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml.j2
similarity index 76%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml.j2
index 4cd5b9629..ff36591a3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/control.yml.j2
@@ -8,8 +8,13 @@
 ---
 classes:
   - system.neutron.control.openvswitch.cluster
+{%- if conf.MCP_VCP %}
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+  - cluster.mcp-pike-common-ha.openstack_control
+  - cluster.mcp-pike-ovs-ha.infra
+{%- else %}
   - cluster.mcp-pike-common-ha.openstack_control_novcp
-  - cluster.mcp-pike-ovs-novcp-ha
+  - cluster.mcp-pike-ovs-ha
 parameters:
   apache:
     server:
@@ -17,3 +22,4 @@ parameters:
         # NOTE(armband): We first override mods to ~, then to this to drop ssl
         - rewrite
         - wsgi
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml.j2
index de5151c8e..d89db40ca 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/database.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_database
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml
deleted file mode 100644
index 20eb82cc3..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml
+++ /dev/null
@@ -1,18 +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_init
-parameters:
-  _param:
-    neutron_tenant_network_types: "flat,vxlan"
-    nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
-    compute_hugepages_size: 1G
-    compute_hugepages_count: 16
-    compute_hugepages_mount: /mnt/hugepages_1G
-    compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml.j2
similarity index 87%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml.j2
index 7540c0074..54b790cc6 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/init.yml.j2
@@ -7,7 +7,11 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
+  - cluster.mcp-pike-common-ha.openstack_init
+{%- else %}
   - cluster.mcp-pike-common-ha.openstack_init_novcp
+{%- endif %}
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
@@ -16,9 +20,11 @@ parameters:
     compute_hugepages_count: 16
     compute_hugepages_mount: /mnt/hugepages_1G
     compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+{%- if not conf.MCP_VCP %}
   apache:
     server:
       # NOTE(armband): override these to ~ first, so we can later drop ssl/443
       bind:
         ports: ~
       modules: ~
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml.j2
index 145db8f5f..53ac809fb 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/message_queue.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_message_queue
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
deleted file mode 100644
index 032da69e5..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml
+++ /dev/null
@@ -1,12 +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_interface_vcp_triport
-  - cluster.mcp-pike-common-ha.openstack_proxy
-  - cluster.mcp-pike-ovs-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml.j2
similarity index 92%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml.j2
index 89b095430..75061d413 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/proxy.yml.j2
@@ -7,7 +7,13 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
+  - cluster.mcp-pike-common-ha.openstack_interface_vcp_triport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_proxy
+{%- if conf.MCP_VCP %}
+  - cluster.mcp-pike-ovs-ha.infra
+{%- else %}
   - system.keepalived.cluster.instance.openstack_web_public_vip
 parameters:
   linux:
@@ -57,3 +63,4 @@ parameters:
           <<: *nginx_openstack_proxy_address
         nginx_static_reclass_doc:
           <<: *nginx_openstack_proxy_address
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml.j2
similarity index 89%
rename from mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
rename to mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml.j2
index b13297c0f..1c396c200 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/telemetry.yml.j2
@@ -7,6 +7,10 @@
 ##############################################################################
 ---
 classes:
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-common-ha.openstack_interface_vcp_biport
+{%- endif %}
   - cluster.mcp-pike-common-ha.openstack_telemetry
+{%- if conf.MCP_VCP %}
   - cluster.mcp-pike-ovs-ha.infra
+{%- endif %}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml
deleted file mode 100644
index 5681e5a6b..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/config.yml
+++ /dev/null
@@ -1,24 +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.config
-  - cluster.mcp-pike-ovs-novcp-ha.infra
-parameters:
-  reclass:
-    storage:
-      node:
-        openstack_control_node01:  # openstack_proxy_node01
-          params:
-            external_address: ${_param:openstack_proxy_node01_address}
-        openstack_control_node02:  # no proxy role
-          params:
-            external_address: 0.0.0.0
-        openstack_control_node03:  # openstack_proxy_node02
-          params:
-            external_address: ${_param:openstack_proxy_node02_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml
deleted file mode 100644
index 23c299cbc..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/init.yml
+++ /dev/null
@@ -1,18 +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
-  - cluster.mcp-pike-ovs-novcp-ha.openstack
-parameters:
-  _param:
-    cluster_name: mcp-pike-ovs-novcp-ha
-    # For NOVCP, we override kvm addresses to overlap with ctl
-    infra_kvm_node01_address: ${_param:openstack_control_node01_address}
-    infra_kvm_node02_address: ${_param:openstack_control_node02_address}
-    infra_kvm_node03_address: ${_param:openstack_control_node03_address}
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml
deleted file mode 100644
index 887af029d..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/kvm.yml
+++ /dev/null
@@ -1,12 +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
-##############################################################################
----
-# NOTE(armband): we don't want to pull in salt.control for novcp
-# classes:
-#   - cluster.mcp-pike-common-ha.infra.kvm
-#   - cluster.mcp-pike-ovs-novcp-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml
deleted file mode 100644
index e694679b9..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/infra/maas.yml
+++ /dev/null
@@ -1,11 +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.maas
-  - cluster.mcp-pike-ovs-novcp-ha.infra
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml
deleted file mode 100644
index 234418d9c..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/init.yml
+++ /dev/null
@@ -1,12 +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.all-mcp-arch-common
-  - cluster.mcp-pike-ovs-novcp-ha.infra
-  - cluster.mcp-pike-ovs-novcp-ha.openstack
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml
deleted file mode 100644
index afe1cc5a6..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute.yml
+++ /dev/null
@@ -1,17 +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_compute
-  - cluster.mcp-pike-ovs-novcp-ha.openstack.compute_pdf
-  - cluster.mcp-pike-ovs-novcp-ha.infra
-parameters:
-  nova:
-    compute:
-      libvirt_service: libvirtd
-      libvirt_bin: /etc/default/libvirtd
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2
deleted file mode 120000
index d43451a2a..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/compute_pdf.yml.j2
+++ /dev/null
@@ -1 +0,0 @@
-../../mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
\ No newline at end of file
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml
deleted file mode 100644
index 163769524..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/database.yml
+++ /dev/null
@@ -1,10 +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_database
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml
deleted file mode 100644
index 0fd4a8a54..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/message_queue.yml
+++ /dev/null
@@ -1,10 +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_message_queue
diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml
deleted file mode 100644
index 1cb72ac5c..000000000
--- a/mcp/reclass/classes/cluster/mcp-pike-ovs-novcp-ha/openstack/telemetry.yml
+++ /dev/null
@@ -1,10 +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_telemetry
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
index f5e3bb0be..5e3cb0186 100644
--- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-ha.local.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# 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
diff --git a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-novcp-ha.local.yml b/mcp/reclass/nodes/cfg01.mcp-pike-ovs-novcp-ha.local.yml
deleted file mode 100644
index eb1f794af..000000000
--- a/mcp/reclass/nodes/cfg01.mcp-pike-ovs-novcp-ha.local.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 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-ovs-novcp-ha.infra.config
-parameters:
-  _param:
-    linux_system_codename: xenial
-    reclass_data_revision: master
-  linux:
-    system:
-      name: cfg01
-      domain: mcp-pike-ovs-novcp-ha.local