diff --git a/jobs/global.yaml b/jobs/global.yaml
index dcb7ceb..32baf23 100755
--- a/jobs/global.yaml
+++ b/jobs/global.yaml
@@ -1,16 +1,17 @@
-- defaults:
-    name: global
-    job-description: |
-      Do not edit this job through the web ! <br>
-      Please use jenkins-job-builder in git <br>
-      git clone ssh://gerrit.mcp.mirantis.com:29418/mcp/tcp-qa
-
-      <h1><font color='red'>
-      <!--- INSERT ALERT HERE vvvvvvv --->
-
-      <!--- INSERT ALERT HERE ^^^^^^^ --->
-      </font></h1>
-    current-version: 2019.2.21
-    previous-version: 2019.2.20
-    disabled-proposed: false
-    disabled-2019-2-0: true
+- defaults:
+    name: global
+    job-description: |
+      Do not edit this job through the web ! <br>
+      Please use jenkins-job-builder in git <br>
+      git clone ssh://gerrit.mcp.mirantis.com:29418/mcp/tcp-qa
+
+      <h1><font color='red'>
+      <!--- INSERT ALERT HERE vvvvvvv --->
+
+      <!--- INSERT ALERT HERE ^^^^^^^ --->
+      </font></h1>
+    current-version: 2019.2.21
+    previous-version: 2019.2.20
+    disabled-proposed: false
+    disabled-2019-2-0: true
+    upgrade-to-tag: false
diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 5106d80..769d576 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -17,7 +17,7 @@
     node_with_reports = "${NODE_NAME}"
     make_snapshot_stages = "${env.MAKE_SNAPSHOT_STAGES}" != "false" ? true : false
 } else if (env_manager == 'heat') {
-    jenkins_slave_node_name = "openstack_slave_${JOB_NAME}"
+    jenkins_slave_node_name = "openstack_slave_${env.ENV_NAME}"
     make_snapshot_stages = false
     node_with_reports = jenkins_slave_node_name
 }
@@ -217,16 +217,38 @@
         if (env.RUN_UPGRADE_AFTER_JOB == "true" && currentBuild.result == 'SUCCESS') {
             network_backend = env.PLATFORM_STACK_INSTALL.contains("contrail") ? 'contrail' : 'dvr'
             upgrade_job = "mcp-update-${env.TEMPEST_IMAGE_VERSION}-${network_backend}-sl"
+            upgrade_to_tag = ''
+            contrail_upgrade_line = ''
+            if(env.UPGRADE_TO_TAG == "true") {
+                upgrade_to_tag = '--update-to-tag ${env.UPGRADE_VERSION_TAG} '
+            }
+            if(env.PLATFORM_STACK_INSTALL.contains("contrail")) {
+                contrail_upgrade_line = "tcp_tests/tests/system/test_upgrade_contrail.py::TestUpdateContrail "
+            }
+            run_test_opts = """--keep-duplicates --maxfail=1 \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_drivetrain ${upgrade_to_tag} \
+                ${contrail_upgrade_line}\
+                tcp_tests/tests/system/test_mcp_update.py::TestOpenstackUpdate \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_galera --update-mysql-version 5.7 \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_rabbit \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_stacklight \
+                tcp_tests/tests/system/test_mcp_update.py::TestUpdateMcpCluster::test_update_ceph \
+                \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
+                tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
+            """
             if (env.IPMI_CREDS) {
                 upgrade_job = "mcp-update-bm-b300-queens-ovs-maas"
             }
             def deploy = build job: "${upgrade_job}",
                 parameters: [
-                    string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.LAB_CONFIG_NAME}"),
+                    string(name: 'PARENT_NODE_NAME', value: "openstack_slave_${env.ENV_NAME}"),
                     string(name: 'TCP_QA_REFS', value: env.TCP_QA_REFS),
                     string(name: 'PASSED_STEPS', value: steps),
                     string(name: 'TEMPEST_TEST_SUITE_NAME', value: env.TEMPEST_TEST_SUITE_NAME),
-                    string(name: 'NODE', value: "openstack_slave_${env.LAB_CONFIG_NAME}")
+                    string(name: 'NODE', value: "openstack_slave_${env.ENV_NAME}"),
+                    string(name: 'RUN_TEST_OPTS', value: run_test_opts)
                 ],
                 wait: false,
                 propagate: false
diff --git a/jobs/pipelines/remove-old-jenkins-agents.groovy b/jobs/pipelines/remove-old-jenkins-agents.groovy
new file mode 100644
index 0000000..eb2ccd8
--- /dev/null
+++ b/jobs/pipelines/remove-old-jenkins-agents.groovy
@@ -0,0 +1,60 @@
+import hudson.node_monitors.*
+import hudson.slaves.*
+import java.util.concurrent.*
+
+jenkins = Jenkins.instance
+
+import javax.mail.internet.*;
+import javax.mail.*
+import javax.activation.*
+
+def getEnviron(computer) {
+   def env
+   def thread = Thread.start("Getting env from ${computer.name}", { env = computer.environment })
+   thread.join(2000)
+   if (thread.isAlive()) thread.interrupt()
+   env
+}
+
+def agentAccessible(computer) {
+    getEnviron(computer)?.get('PATH') != null
+}
+
+def numberOfflineNodes = 0
+def numberNodes = 0
+for (agent in jenkins.getNodes()) {
+   def computer = agent.computer
+   numberNodes ++
+   println ""
+   println "Checking computer ${computer.name}:"
+   def isOK = (agentAccessible(computer) && !computer.offline)
+   if (isOK) {
+     println "\t\tOK, got PATH back from agent ${computer.name}."
+
+   } else {
+     numberOfflineNodes ++
+     println "  ERROR: can't get PATH from agent ${computer.name}."
+     //if (computer.isTemporarilyOffline()) {
+     //  if (!computer.getOfflineCause().toString().contains("Disconnected by")) {
+     //    computer.setTemporarilyOffline(false, agent.getComputer().getOfflineCause())
+     //  }
+     //} else {
+     //    //computer.connect(true)
+     //}
+
+     if (computer.isOffline() && !computer.isTemporarilyOffline())
+     {
+       println "!!!! this node will be killed !!!";
+       computer.doDoDelete();
+     }
+   }
+     println('\tcomputer.isOffline: ' + computer.isOffline());
+     println('\tcomputer.isTemporarilyOffline: ' + computer.isTemporarilyOffline());
+     println('\tcomputer.getOfflineCause: ' + computer.getOfflineCause());
+     println('\tcomputer.offline: ' + computer.offline);
+     time = computer.getIdleStartMilliseconds() ;
+     println('\tcomputer.getConnectTime: ' + new Date(time).toString());
+ }
+println ("Number of Offline Nodes: " + numberOfflineNodes)
+println ("Number of Nodes: " + numberNodes)
+
diff --git a/jobs/pipelines/swarm-run-pytest.groovy b/jobs/pipelines/swarm-run-pytest.groovy
index 431d238..21fdb9e 100644
--- a/jobs/pipelines/swarm-run-pytest.groovy
+++ b/jobs/pipelines/swarm-run-pytest.groovy
@@ -12,6 +12,7 @@
  *   PARENT_WORKSPACE              Path to the workspace of the parent job to use tcp-qa repo
  *   TCP_QA_REFS                   Reference to the tcp-qa change on Gerrit, like refs/changes/46/418546/41
  *   SHUTDOWN_ENV_ON_TEARDOWN      optional, shutdown fuel-devops environment at the end of the job
+ *   LAB_CONFIG_NAME
  *   TEMPEST_IMAGE_VERSION         Tempest image version: pike by default, can be queens.
  *   TEMPEST_TARGET                Node where tempest will be run
  *   MAKE_SNAPSHOT_STAGES          optional, use "dos.py snapshot" to snapshot stages
@@ -68,6 +69,7 @@
                             export PYTHONHTTPSVERIFY=0
                             export TESTS_CONFIGS=${ENV_NAME}_salt_deployed.ini
                             export ENV_MANAGER=$ENV_MANAGER  # use 'hardware' fixture to manage fuel-devops environment
+                            export LAB_CONFIG_NAME=${LAB_CONFIG_NAME}
                             export salt_master_host=\$SALT_MASTER_IP  # skip salt_deployed fixture
                             export salt_master_port=6969
                             export SALT_USER=\$SALTAPI_USER
diff --git a/jobs/project.yaml b/jobs/project.yaml
index 145ae0d..83b78ee 100644
--- a/jobs/project.yaml
+++ b/jobs/project.yaml
@@ -55,6 +55,7 @@
       - environment-template-ci
       - self-deploy-jobs
       - self-deploy-virtualenvs
+      - cleanup-jenkins-agents
       - tcp-qa-ci
       - test_cleanup
       # - testrail-reporter-ci - can't moved to JJB, unsupported parameters
diff --git a/jobs/templates/cleanup-jenkins-agents.yml b/jobs/templates/cleanup-jenkins-agents.yml
new file mode 100644
index 0000000..859463c
--- /dev/null
+++ b/jobs/templates/cleanup-jenkins-agents.yml
@@ -0,0 +1,18 @@
+- job-template:
+    project-type: pipeline
+    description: '{job-description}'
+    concurrent: false
+    disabled: false
+    name: cleanup-jenkins-agents
+    triggers:
+      - timed: 00 2 * * Sun
+    pipeline-scm:
+      lightweight-checkout: true
+      scm:
+      - git:
+          branches:
+          - master
+          url: https://gerrit.mcp.mirantis.com/mcp/tcp-qa
+      script-path: jobs/pipelines/remove-old-jenkins-agents.groovy
+    logrotate:
+      daysToKeep: 365
\ No newline at end of file
diff --git a/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
index bd20f81..7fd05f8 100644
--- a/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/released-bm-b300-cicd-queens-ovs-maas.yml
@@ -94,8 +94,7 @@
     - string:
         default: |-
           --keep-duplicates --maxfail=1 \
-            tcp_tests/tests/system/test_deploy_250_computes.py::TestkDeploy250Computes::test_deploy_250_computes \
-            \
+            tcp_tests/tests/system/test_deploy_250_computes.py \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_tempest \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_func_sanity \
             tcp_tests/tests/system/test_cvp_pipelines.py::TestCvpPipelines::test_run_cvp_stacklight
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index 0e00a79..37aadc0 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -212,6 +212,15 @@
         name: RUN_UPGRADE_AFTER_JOB
         default: true
         description: "Upgrade and test after deploy?"
+    - bool:
+        name: UPGRADE_TO_TAG
+        default: '{upgrade-to-tag}'
+        description: "Upgrade to new tag"
+    - string:
+        name: UPGRADE_VERSION_TAG
+        default: "{current-version}"
+        description: 'Only works in conjunction with UPGRADE_TO_TAG and must be younger than the deployed version.'
+        trim: 'false'
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index da9c52a..0ea7e7b 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -212,6 +212,15 @@
         name: RUN_UPGRADE_AFTER_JOB
         default: true
         description: "Upgrade and test after deploy?"
+    - bool:
+        name: UPGRADE_TO_TAG
+        default: '{upgrade-to-tag}'
+        description: "Upgrade to new tag"
+    - string:
+        name: UPGRADE_VERSION_TAG
+        default: "{current-version}"
+        description: 'Only works in conjunction with UPGRADE_TO_TAG and must be younger than the deployed version.'
+        trim: 'false'
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 89f5d39..91f5f18 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -215,6 +215,15 @@
         name: RUN_UPGRADE_AFTER_JOB
         default: true
         description: "Upgrade and test after deploy?"
+    - bool:
+        name: UPGRADE_TO_TAG
+        default: '{upgrade-to-tag}'
+        description: "Upgrade to new tag"
+    - string:
+        name: UPGRADE_VERSION_TAG
+        default: "{current-version}"
+        description: 'Only works in conjunction with UPGRADE_TO_TAG and must be younger than the deployed version.'
+        trim: 'false'
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 8d845b6..1740a26 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -212,6 +212,15 @@
         name: RUN_UPGRADE_AFTER_JOB
         default: true
         description: "Upgrade and test after deploy?"
+    - bool:
+        name: UPGRADE_TO_TAG
+        default: '{upgrade-to-tag}'
+        description: "Upgrade to new tag"
+    - string:
+        name: UPGRADE_VERSION_TAG
+        default: "{current-version}"
+        description: 'Only works in conjunction with UPGRADE_TO_TAG and must be younger than the deployed version.'
+        trim: 'false'
     pipeline-scm:
       lightweight-checkout: false
       scm:
diff --git a/jobs/templates/swarm-run-pytest.yml b/jobs/templates/swarm-run-pytest.yml
index 9d22f9d..e06b3ef 100644
--- a/jobs/templates/swarm-run-pytest.yml
+++ b/jobs/templates/swarm-run-pytest.yml
@@ -12,6 +12,11 @@
         trim: 'false'
     - string:
         default: ''
+        description: ''
+        name: LAB_CONFIG_NAME
+        trim: 'false'
+    - string:
+        default: ''
         description: 'Example: refs/changes/89/411189/36
                        (for now - only one reference allowed)'
         name: TCP_QA_REFS
diff --git a/jobs/view.yaml b/jobs/view.yaml
index a6caaf2..307c4c6 100644
--- a/jobs/view.yaml
+++ b/jobs/view.yaml
@@ -73,6 +73,7 @@
     job-name:
       - self-deploy-jobs
       - self-deploy-virtualenvs
+      - cleanup-jenkins-agents
     columns:
       - status
       - weather
diff --git a/src/com/mirantis/system_qa/SharedPipeline.groovy b/src/com/mirantis/system_qa/SharedPipeline.groovy
index 98c0252..50f883f 100644
--- a/src/com/mirantis/system_qa/SharedPipeline.groovy
+++ b/src/com/mirantis/system_qa/SharedPipeline.groovy
@@ -383,6 +383,7 @@
         def tempest_pattern=env.TEMPEST_PATTERN ?: 'tempest'
         def parameters = [
                 string(name: 'ENV_NAME', value: "${ENV_NAME}"),
+                string(name: 'LAB_CONFIG_NAME', value: "${LAB_CONFIG_NAME}"),
                 string(name: 'PASSED_STEPS', value: passed_steps),
                 text(name: 'RUN_TEST_OPTS', value: "${RUN_TEST_OPTS}"),
                 string(name: 'PARENT_NODE_NAME', value: jenkins_slave_node_name),
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index fbbb9b8..431ef7b 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -508,3 +508,7 @@
                         user=kubernetes_admin_user,
                         password=kubernetes_admin_password)
             )
+
+    def get_minions_by_target(self, tgt):
+        result = self.local(tgt=tgt, fun="test.ping")
+        return result['return'][0].keys()
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/env_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/env_add.yml
new file mode 100755
index 0000000..e29d197
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/env_add.yml
@@ -0,0 +1,136 @@
+parameters:
+  reclass:
+    storage:
+      node:
+        infra_kvm_node01:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+        infra_kvm_node02:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+        infra_kvm_node03:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+        infra_kvm_node04:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+        infra_kvm_node05:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
+        infra_kvm_node06:
+          params:
+            linux_network_interfaces:
+              br_mesh:
+                address: ${_param:_esc}{_param:tenant_address}
+                enabled: true
+                netmask: ${_param:_esc}{_param:tenant_network_netmask}
+                proto: static
+                type: bridge
+                use_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+                require_interfaces:
+                - bond0.${_param:_esc}{_param:tenant_vlan}
+              bond0.tenant_vlan:
+                name: bond0.${_param:_esc}{_param:tenant_vlan}
+                enabled: true
+                proto: manual
+                type: vlan
+                use_interfaces:
+                - bond0
+                require_interfaces:
+                - bond0
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_config_nodes_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_config_nodes_add.yml
new file mode 100755
index 0000000..db3c3a5
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_config_nodes_add.yml
@@ -0,0 +1,42 @@
+parameters:
+  reclass:
+    storage:
+      node:
+        infra_kvm_node01:
+          params:
+            tenant_address: 10.167.12.101
+        infra_kvm_node02:
+          params:
+            tenant_address: 10.167.12.102
+        infra_kvm_node03:
+          params:
+            tenant_address: 10.167.12.103
+        infra_kvm_node04:
+          params:
+            tenant_address: 10.167.12.104
+        infra_kvm_node05:
+          params:
+            tenant_address: 10.167.12.105
+        infra_kvm_node06:
+          params:
+            tenant_address: 10.167.12.106
+        openstack_compute_rack02:
+          name: ${_param:openstack_compute_rack02_hostname}<<count>>
+          domain: ${_param:cluster_domain}
+          classes:
+          - cluster.${_param:cluster_name}.openstack.compute.vcmp
+          repeat:
+            count: 254
+            ip_ranges:
+              single_address: 10.167.10.1-10.167.10.254
+              tenant_address: 10.167.13.1-10.167.13.254
+            start: 1
+            digits: 1
+            params:
+              single_address:
+                value: <<single_address>>
+              tenant_address:
+                value: <<tenant_address>>
+          params:
+            salt_master_host: ${_param:reclass_config_master}
+            linux_system_codename: xenial
\ No newline at end of file
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_kvm_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_kvm_add.yml
new file mode 100755
index 0000000..9f86655
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/infra_kvm_add.yml
@@ -0,0 +1,16 @@
+classes:
+- cluster.bm-b300-cicd-queens-ovs-maas.infra.openstack_vcompute_cluster
+parameters:
+  virt:
+    nic:
+      vcmp:
+        eth4:
+          bridge: br_mgm
+        eth3:
+          bridge: br_ctl
+        eth2:
+          bridge: br_baremetal
+        eth1:
+          bridge: br_mesh
+        eth0:
+          bridge: br_baremetal
\ No newline at end of file
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_init_add.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_init_add.yml
new file mode 100755
index 0000000..ba8cb40
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_init_add.yml
@@ -0,0 +1,1770 @@
+parameters:
+  _param:
+    openstack_compute_rack02_hostname: vcmp
+    openstack_vcmp_node3_hostname: vcmp3
+    openstack_vcmp_node3_address: 10.167.10.3
+    openstack_vcmp_node4_hostname: vcmp4
+    openstack_vcmp_node4_address: 10.167.10.4
+    openstack_vcmp_node5_hostname: vcmp5
+    openstack_vcmp_node5_address: 10.167.10.5
+    openstack_vcmp_node6_hostname: vcmp6
+    openstack_vcmp_node6_address: 10.167.10.6
+    openstack_vcmp_node7_hostname: vcmp7
+    openstack_vcmp_node7_address: 10.167.10.7
+    openstack_vcmp_node8_hostname: vcmp8
+    openstack_vcmp_node8_address: 10.167.10.8
+    openstack_vcmp_node9_hostname: vcmp9
+    openstack_vcmp_node9_address: 10.167.10.9
+    openstack_vcmp_node10_hostname: vcmp10
+    openstack_vcmp_node10_address: 10.167.10.10
+    openstack_vcmp_node11_hostname: vcmp11
+    openstack_vcmp_node11_address: 10.167.10.11
+    openstack_vcmp_node12_hostname: vcmp12
+    openstack_vcmp_node12_address: 10.167.10.12
+    openstack_vcmp_node13_hostname: vcmp13
+    openstack_vcmp_node13_address: 10.167.10.13
+    openstack_vcmp_node14_hostname: vcmp14
+    openstack_vcmp_node14_address: 10.167.10.14
+    openstack_vcmp_node15_hostname: vcmp15
+    openstack_vcmp_node15_address: 10.167.10.15
+    openstack_vcmp_node16_hostname: vcmp16
+    openstack_vcmp_node16_address: 10.167.10.16
+    openstack_vcmp_node17_hostname: vcmp17
+    openstack_vcmp_node17_address: 10.167.10.17
+    openstack_vcmp_node18_hostname: vcmp18
+    openstack_vcmp_node18_address: 10.167.10.18
+    openstack_vcmp_node19_hostname: vcmp19
+    openstack_vcmp_node19_address: 10.167.10.19
+    openstack_vcmp_node20_hostname: vcmp20
+    openstack_vcmp_node20_address: 10.167.10.20
+    openstack_vcmp_node21_hostname: vcmp21
+    openstack_vcmp_node21_address: 10.167.10.21
+    openstack_vcmp_node22_hostname: vcmp22
+    openstack_vcmp_node22_address: 10.167.10.22
+    openstack_vcmp_node23_hostname: vcmp23
+    openstack_vcmp_node23_address: 10.167.10.23
+    openstack_vcmp_node24_hostname: vcmp24
+    openstack_vcmp_node24_address: 10.167.10.24
+    openstack_vcmp_node25_hostname: vcmp25
+    openstack_vcmp_node25_address: 10.167.10.25
+    openstack_vcmp_node26_hostname: vcmp26
+    openstack_vcmp_node26_address: 10.167.10.26
+    openstack_vcmp_node27_hostname: vcmp27
+    openstack_vcmp_node27_address: 10.167.10.27
+    openstack_vcmp_node28_hostname: vcmp28
+    openstack_vcmp_node28_address: 10.167.10.28
+    openstack_vcmp_node29_hostname: vcmp29
+    openstack_vcmp_node29_address: 10.167.10.29
+    openstack_vcmp_node30_hostname: vcmp30
+    openstack_vcmp_node30_address: 10.167.10.30
+    openstack_vcmp_node31_hostname: vcmp31
+    openstack_vcmp_node31_address: 10.167.10.31
+    openstack_vcmp_node32_hostname: vcmp32
+    openstack_vcmp_node32_address: 10.167.10.32
+    openstack_vcmp_node33_hostname: vcmp33
+    openstack_vcmp_node33_address: 10.167.10.33
+    openstack_vcmp_node34_hostname: vcmp34
+    openstack_vcmp_node34_address: 10.167.10.34
+    openstack_vcmp_node35_hostname: vcmp35
+    openstack_vcmp_node35_address: 10.167.10.35
+    openstack_vcmp_node36_hostname: vcmp36
+    openstack_vcmp_node36_address: 10.167.10.36
+    openstack_vcmp_node37_hostname: vcmp37
+    openstack_vcmp_node37_address: 10.167.10.37
+    openstack_vcmp_node38_hostname: vcmp38
+    openstack_vcmp_node38_address: 10.167.10.38
+    openstack_vcmp_node39_hostname: vcmp39
+    openstack_vcmp_node39_address: 10.167.10.39
+    openstack_vcmp_node40_hostname: vcmp40
+    openstack_vcmp_node40_address: 10.167.10.40
+    openstack_vcmp_node41_hostname: vcmp41
+    openstack_vcmp_node41_address: 10.167.10.41
+    openstack_vcmp_node42_hostname: vcmp42
+    openstack_vcmp_node42_address: 10.167.10.42
+    openstack_vcmp_node43_hostname: vcmp43
+    openstack_vcmp_node43_address: 10.167.10.43
+    openstack_vcmp_node44_hostname: vcmp44
+    openstack_vcmp_node44_address: 10.167.10.44
+    openstack_vcmp_node45_hostname: vcmp45
+    openstack_vcmp_node45_address: 10.167.10.45
+    openstack_vcmp_node46_hostname: vcmp46
+    openstack_vcmp_node46_address: 10.167.10.46
+    openstack_vcmp_node47_hostname: vcmp47
+    openstack_vcmp_node47_address: 10.167.10.47
+    openstack_vcmp_node48_hostname: vcmp48
+    openstack_vcmp_node48_address: 10.167.10.48
+    openstack_vcmp_node49_hostname: vcmp49
+    openstack_vcmp_node49_address: 10.167.10.49
+    openstack_vcmp_node50_hostname: vcmp50
+    openstack_vcmp_node50_address: 10.167.10.50
+    openstack_vcmp_node51_hostname: vcmp51
+    openstack_vcmp_node51_address: 10.167.10.51
+    openstack_vcmp_node52_hostname: vcmp52
+    openstack_vcmp_node52_address: 10.167.10.52
+    openstack_vcmp_node53_hostname: vcmp53
+    openstack_vcmp_node53_address: 10.167.10.53
+    openstack_vcmp_node54_hostname: vcmp54
+    openstack_vcmp_node54_address: 10.167.10.54
+    openstack_vcmp_node55_hostname: vcmp55
+    openstack_vcmp_node55_address: 10.167.10.55
+    openstack_vcmp_node56_hostname: vcmp56
+    openstack_vcmp_node56_address: 10.167.10.56
+    openstack_vcmp_node57_hostname: vcmp57
+    openstack_vcmp_node57_address: 10.167.10.57
+    openstack_vcmp_node58_hostname: vcmp58
+    openstack_vcmp_node58_address: 10.167.10.58
+    openstack_vcmp_node59_hostname: vcmp59
+    openstack_vcmp_node59_address: 10.167.10.59
+    openstack_vcmp_node60_hostname: vcmp60
+    openstack_vcmp_node60_address: 10.167.10.60
+    openstack_vcmp_node61_hostname: vcmp61
+    openstack_vcmp_node61_address: 10.167.10.61
+    openstack_vcmp_node62_hostname: vcmp62
+    openstack_vcmp_node62_address: 10.167.10.62
+    openstack_vcmp_node63_hostname: vcmp63
+    openstack_vcmp_node63_address: 10.167.10.63
+    openstack_vcmp_node64_hostname: vcmp64
+    openstack_vcmp_node64_address: 10.167.10.64
+    openstack_vcmp_node65_hostname: vcmp65
+    openstack_vcmp_node65_address: 10.167.10.65
+    openstack_vcmp_node66_hostname: vcmp66
+    openstack_vcmp_node66_address: 10.167.10.66
+    openstack_vcmp_node67_hostname: vcmp67
+    openstack_vcmp_node67_address: 10.167.10.67
+    openstack_vcmp_node68_hostname: vcmp68
+    openstack_vcmp_node68_address: 10.167.10.68
+    openstack_vcmp_node69_hostname: vcmp69
+    openstack_vcmp_node69_address: 10.167.10.69
+    openstack_vcmp_node70_hostname: vcmp70
+    openstack_vcmp_node70_address: 10.167.10.70
+    openstack_vcmp_node71_hostname: vcmp71
+    openstack_vcmp_node71_address: 10.167.10.71
+    openstack_vcmp_node72_hostname: vcmp72
+    openstack_vcmp_node72_address: 10.167.10.72
+    openstack_vcmp_node73_hostname: vcmp73
+    openstack_vcmp_node73_address: 10.167.10.73
+    openstack_vcmp_node74_hostname: vcmp74
+    openstack_vcmp_node74_address: 10.167.10.74
+    openstack_vcmp_node75_hostname: vcmp75
+    openstack_vcmp_node75_address: 10.167.10.75
+    openstack_vcmp_node76_hostname: vcmp76
+    openstack_vcmp_node76_address: 10.167.10.76
+    openstack_vcmp_node77_hostname: vcmp77
+    openstack_vcmp_node77_address: 10.167.10.77
+    openstack_vcmp_node78_hostname: vcmp78
+    openstack_vcmp_node78_address: 10.167.10.78
+    openstack_vcmp_node79_hostname: vcmp79
+    openstack_vcmp_node79_address: 10.167.10.79
+    openstack_vcmp_node80_hostname: vcmp80
+    openstack_vcmp_node80_address: 10.167.10.80
+    openstack_vcmp_node81_hostname: vcmp81
+    openstack_vcmp_node81_address: 10.167.10.81
+    openstack_vcmp_node82_hostname: vcmp82
+    openstack_vcmp_node82_address: 10.167.10.82
+    openstack_vcmp_node83_hostname: vcmp83
+    openstack_vcmp_node83_address: 10.167.10.83
+    openstack_vcmp_node84_hostname: vcmp84
+    openstack_vcmp_node84_address: 10.167.10.84
+    openstack_vcmp_node85_hostname: vcmp85
+    openstack_vcmp_node85_address: 10.167.10.85
+    openstack_vcmp_node86_hostname: vcmp86
+    openstack_vcmp_node86_address: 10.167.10.86
+    openstack_vcmp_node87_hostname: vcmp87
+    openstack_vcmp_node87_address: 10.167.10.87
+    openstack_vcmp_node88_hostname: vcmp88
+    openstack_vcmp_node88_address: 10.167.10.88
+    openstack_vcmp_node89_hostname: vcmp89
+    openstack_vcmp_node89_address: 10.167.10.89
+    openstack_vcmp_node90_hostname: vcmp90
+    openstack_vcmp_node90_address: 10.167.10.90
+    openstack_vcmp_node91_hostname: vcmp91
+    openstack_vcmp_node91_address: 10.167.10.91
+    openstack_vcmp_node92_hostname: vcmp92
+    openstack_vcmp_node92_address: 10.167.10.92
+    openstack_vcmp_node93_hostname: vcmp93
+    openstack_vcmp_node93_address: 10.167.10.93
+    openstack_vcmp_node94_hostname: vcmp94
+    openstack_vcmp_node94_address: 10.167.10.94
+    openstack_vcmp_node95_hostname: vcmp95
+    openstack_vcmp_node95_address: 10.167.10.95
+    openstack_vcmp_node96_hostname: vcmp96
+    openstack_vcmp_node96_address: 10.167.10.96
+    openstack_vcmp_node97_hostname: vcmp97
+    openstack_vcmp_node97_address: 10.167.10.97
+    openstack_vcmp_node98_hostname: vcmp98
+    openstack_vcmp_node98_address: 10.167.10.98
+    openstack_vcmp_node99_hostname: vcmp99
+    openstack_vcmp_node99_address: 10.167.10.99
+    openstack_vcmp_node100_hostname: vcmp100
+    openstack_vcmp_node100_address: 10.167.10.100
+    openstack_vcmp_node101_hostname: vcmp101
+    openstack_vcmp_node101_address: 10.167.10.101
+    openstack_vcmp_node102_hostname: vcmp102
+    openstack_vcmp_node102_address: 10.167.10.102
+    openstack_vcmp_node103_hostname: vcmp103
+    openstack_vcmp_node103_address: 10.167.10.103
+    openstack_vcmp_node104_hostname: vcmp104
+    openstack_vcmp_node104_address: 10.167.10.104
+    openstack_vcmp_node105_hostname: vcmp105
+    openstack_vcmp_node105_address: 10.167.10.105
+    openstack_vcmp_node106_hostname: vcmp106
+    openstack_vcmp_node106_address: 10.167.10.106
+    openstack_vcmp_node107_hostname: vcmp107
+    openstack_vcmp_node107_address: 10.167.10.107
+    openstack_vcmp_node108_hostname: vcmp108
+    openstack_vcmp_node108_address: 10.167.10.108
+    openstack_vcmp_node109_hostname: vcmp109
+    openstack_vcmp_node109_address: 10.167.10.109
+    openstack_vcmp_node110_hostname: vcmp110
+    openstack_vcmp_node110_address: 10.167.10.110
+    openstack_vcmp_node111_hostname: vcmp111
+    openstack_vcmp_node111_address: 10.167.10.111
+    openstack_vcmp_node112_hostname: vcmp112
+    openstack_vcmp_node112_address: 10.167.10.112
+    openstack_vcmp_node113_hostname: vcmp113
+    openstack_vcmp_node113_address: 10.167.10.113
+    openstack_vcmp_node114_hostname: vcmp114
+    openstack_vcmp_node114_address: 10.167.10.114
+    openstack_vcmp_node115_hostname: vcmp115
+    openstack_vcmp_node115_address: 10.167.10.115
+    openstack_vcmp_node116_hostname: vcmp116
+    openstack_vcmp_node116_address: 10.167.10.116
+    openstack_vcmp_node117_hostname: vcmp117
+    openstack_vcmp_node117_address: 10.167.10.117
+    openstack_vcmp_node118_hostname: vcmp118
+    openstack_vcmp_node118_address: 10.167.10.118
+    openstack_vcmp_node119_hostname: vcmp119
+    openstack_vcmp_node119_address: 10.167.10.119
+    openstack_vcmp_node120_hostname: vcmp120
+    openstack_vcmp_node120_address: 10.167.10.120
+    openstack_vcmp_node121_hostname: vcmp121
+    openstack_vcmp_node121_address: 10.167.10.121
+    openstack_vcmp_node122_hostname: vcmp122
+    openstack_vcmp_node122_address: 10.167.10.122
+    openstack_vcmp_node123_hostname: vcmp123
+    openstack_vcmp_node123_address: 10.167.10.123
+    openstack_vcmp_node124_hostname: vcmp124
+    openstack_vcmp_node124_address: 10.167.10.124
+    openstack_vcmp_node125_hostname: vcmp125
+    openstack_vcmp_node125_address: 10.167.10.125
+    openstack_vcmp_node126_hostname: vcmp126
+    openstack_vcmp_node126_address: 10.167.10.126
+    openstack_vcmp_node127_hostname: vcmp127
+    openstack_vcmp_node127_address: 10.167.10.127
+    openstack_vcmp_node128_hostname: vcmp128
+    openstack_vcmp_node128_address: 10.167.10.128
+    openstack_vcmp_node129_hostname: vcmp129
+    openstack_vcmp_node129_address: 10.167.10.129
+    openstack_vcmp_node130_hostname: vcmp130
+    openstack_vcmp_node130_address: 10.167.10.130
+    openstack_vcmp_node131_hostname: vcmp131
+    openstack_vcmp_node131_address: 10.167.10.131
+    openstack_vcmp_node132_hostname: vcmp132
+    openstack_vcmp_node132_address: 10.167.10.132
+    openstack_vcmp_node133_hostname: vcmp133
+    openstack_vcmp_node133_address: 10.167.10.133
+    openstack_vcmp_node134_hostname: vcmp134
+    openstack_vcmp_node134_address: 10.167.10.134
+    openstack_vcmp_node135_hostname: vcmp135
+    openstack_vcmp_node135_address: 10.167.10.135
+    openstack_vcmp_node136_hostname: vcmp136
+    openstack_vcmp_node136_address: 10.167.10.136
+    openstack_vcmp_node137_hostname: vcmp137
+    openstack_vcmp_node137_address: 10.167.10.137
+    openstack_vcmp_node138_hostname: vcmp138
+    openstack_vcmp_node138_address: 10.167.10.138
+    openstack_vcmp_node139_hostname: vcmp139
+    openstack_vcmp_node139_address: 10.167.10.139
+    openstack_vcmp_node140_hostname: vcmp140
+    openstack_vcmp_node140_address: 10.167.10.140
+    openstack_vcmp_node141_hostname: vcmp141
+    openstack_vcmp_node141_address: 10.167.10.141
+    openstack_vcmp_node142_hostname: vcmp142
+    openstack_vcmp_node142_address: 10.167.10.142
+    openstack_vcmp_node143_hostname: vcmp143
+    openstack_vcmp_node143_address: 10.167.10.143
+    openstack_vcmp_node144_hostname: vcmp144
+    openstack_vcmp_node144_address: 10.167.10.144
+    openstack_vcmp_node145_hostname: vcmp145
+    openstack_vcmp_node145_address: 10.167.10.145
+    openstack_vcmp_node146_hostname: vcmp146
+    openstack_vcmp_node146_address: 10.167.10.146
+    openstack_vcmp_node147_hostname: vcmp147
+    openstack_vcmp_node147_address: 10.167.10.147
+    openstack_vcmp_node148_hostname: vcmp148
+    openstack_vcmp_node148_address: 10.167.10.148
+    openstack_vcmp_node149_hostname: vcmp149
+    openstack_vcmp_node149_address: 10.167.10.149
+    openstack_vcmp_node150_hostname: vcmp150
+    openstack_vcmp_node150_address: 10.167.10.150
+    openstack_vcmp_node151_hostname: vcmp151
+    openstack_vcmp_node151_address: 10.167.10.151
+    openstack_vcmp_node152_hostname: vcmp152
+    openstack_vcmp_node152_address: 10.167.10.152
+    openstack_vcmp_node153_hostname: vcmp153
+    openstack_vcmp_node153_address: 10.167.10.153
+    openstack_vcmp_node154_hostname: vcmp154
+    openstack_vcmp_node154_address: 10.167.10.154
+    openstack_vcmp_node155_hostname: vcmp155
+    openstack_vcmp_node155_address: 10.167.10.155
+    openstack_vcmp_node156_hostname: vcmp156
+    openstack_vcmp_node156_address: 10.167.10.156
+    openstack_vcmp_node157_hostname: vcmp157
+    openstack_vcmp_node157_address: 10.167.10.157
+    openstack_vcmp_node158_hostname: vcmp158
+    openstack_vcmp_node158_address: 10.167.10.158
+    openstack_vcmp_node159_hostname: vcmp159
+    openstack_vcmp_node159_address: 10.167.10.159
+    openstack_vcmp_node160_hostname: vcmp160
+    openstack_vcmp_node160_address: 10.167.10.160
+    openstack_vcmp_node161_hostname: vcmp161
+    openstack_vcmp_node161_address: 10.167.10.161
+    openstack_vcmp_node162_hostname: vcmp162
+    openstack_vcmp_node162_address: 10.167.10.162
+    openstack_vcmp_node163_hostname: vcmp163
+    openstack_vcmp_node163_address: 10.167.10.163
+    openstack_vcmp_node164_hostname: vcmp164
+    openstack_vcmp_node164_address: 10.167.10.164
+    openstack_vcmp_node165_hostname: vcmp165
+    openstack_vcmp_node165_address: 10.167.10.165
+    openstack_vcmp_node166_hostname: vcmp166
+    openstack_vcmp_node166_address: 10.167.10.166
+    openstack_vcmp_node167_hostname: vcmp167
+    openstack_vcmp_node167_address: 10.167.10.167
+    openstack_vcmp_node168_hostname: vcmp168
+    openstack_vcmp_node168_address: 10.167.10.168
+    openstack_vcmp_node169_hostname: vcmp169
+    openstack_vcmp_node169_address: 10.167.10.169
+    openstack_vcmp_node170_hostname: vcmp170
+    openstack_vcmp_node170_address: 10.167.10.170
+    openstack_vcmp_node171_hostname: vcmp171
+    openstack_vcmp_node171_address: 10.167.10.171
+    openstack_vcmp_node172_hostname: vcmp172
+    openstack_vcmp_node172_address: 10.167.10.172
+    openstack_vcmp_node173_hostname: vcmp173
+    openstack_vcmp_node173_address: 10.167.10.173
+    openstack_vcmp_node174_hostname: vcmp174
+    openstack_vcmp_node174_address: 10.167.10.174
+    openstack_vcmp_node175_hostname: vcmp175
+    openstack_vcmp_node175_address: 10.167.10.175
+    openstack_vcmp_node176_hostname: vcmp176
+    openstack_vcmp_node176_address: 10.167.10.176
+    openstack_vcmp_node177_hostname: vcmp177
+    openstack_vcmp_node177_address: 10.167.10.177
+    openstack_vcmp_node178_hostname: vcmp178
+    openstack_vcmp_node178_address: 10.167.10.178
+    openstack_vcmp_node179_hostname: vcmp179
+    openstack_vcmp_node179_address: 10.167.10.179
+    openstack_vcmp_node180_hostname: vcmp180
+    openstack_vcmp_node180_address: 10.167.10.180
+    openstack_vcmp_node181_hostname: vcmp181
+    openstack_vcmp_node181_address: 10.167.10.181
+    openstack_vcmp_node182_hostname: vcmp182
+    openstack_vcmp_node182_address: 10.167.10.182
+    openstack_vcmp_node183_hostname: vcmp183
+    openstack_vcmp_node183_address: 10.167.10.183
+    openstack_vcmp_node184_hostname: vcmp184
+    openstack_vcmp_node184_address: 10.167.10.184
+    openstack_vcmp_node185_hostname: vcmp185
+    openstack_vcmp_node185_address: 10.167.10.185
+    openstack_vcmp_node186_hostname: vcmp186
+    openstack_vcmp_node186_address: 10.167.10.186
+    openstack_vcmp_node187_hostname: vcmp187
+    openstack_vcmp_node187_address: 10.167.10.187
+    openstack_vcmp_node188_hostname: vcmp188
+    openstack_vcmp_node188_address: 10.167.10.188
+    openstack_vcmp_node189_hostname: vcmp189
+    openstack_vcmp_node189_address: 10.167.10.189
+    openstack_vcmp_node190_hostname: vcmp190
+    openstack_vcmp_node190_address: 10.167.10.190
+    openstack_vcmp_node191_hostname: vcmp191
+    openstack_vcmp_node191_address: 10.167.10.191
+    openstack_vcmp_node192_hostname: vcmp192
+    openstack_vcmp_node192_address: 10.167.10.192
+    openstack_vcmp_node193_hostname: vcmp193
+    openstack_vcmp_node193_address: 10.167.10.193
+    openstack_vcmp_node194_hostname: vcmp194
+    openstack_vcmp_node194_address: 10.167.10.194
+    openstack_vcmp_node195_hostname: vcmp195
+    openstack_vcmp_node195_address: 10.167.10.195
+    openstack_vcmp_node196_hostname: vcmp196
+    openstack_vcmp_node196_address: 10.167.10.196
+    openstack_vcmp_node197_hostname: vcmp197
+    openstack_vcmp_node197_address: 10.167.10.197
+    openstack_vcmp_node198_hostname: vcmp198
+    openstack_vcmp_node198_address: 10.167.10.198
+    openstack_vcmp_node199_hostname: vcmp199
+    openstack_vcmp_node199_address: 10.167.10.199
+    openstack_vcmp_node200_hostname: vcmp200
+    openstack_vcmp_node200_address: 10.167.10.200
+    openstack_vcmp_node201_hostname: vcmp201
+    openstack_vcmp_node201_address: 10.167.10.201
+    openstack_vcmp_node202_hostname: vcmp202
+    openstack_vcmp_node202_address: 10.167.10.202
+    openstack_vcmp_node203_hostname: vcmp203
+    openstack_vcmp_node203_address: 10.167.10.203
+    openstack_vcmp_node204_hostname: vcmp204
+    openstack_vcmp_node204_address: 10.167.10.204
+    openstack_vcmp_node205_hostname: vcmp205
+    openstack_vcmp_node205_address: 10.167.10.205
+    openstack_vcmp_node206_hostname: vcmp206
+    openstack_vcmp_node206_address: 10.167.10.206
+    openstack_vcmp_node207_hostname: vcmp207
+    openstack_vcmp_node207_address: 10.167.10.207
+    openstack_vcmp_node208_hostname: vcmp208
+    openstack_vcmp_node208_address: 10.167.10.208
+    openstack_vcmp_node209_hostname: vcmp209
+    openstack_vcmp_node209_address: 10.167.10.209
+    openstack_vcmp_node210_hostname: vcmp210
+    openstack_vcmp_node210_address: 10.167.10.210
+    openstack_vcmp_node211_hostname: vcmp211
+    openstack_vcmp_node211_address: 10.167.10.211
+    openstack_vcmp_node212_hostname: vcmp212
+    openstack_vcmp_node212_address: 10.167.10.212
+    openstack_vcmp_node213_hostname: vcmp213
+    openstack_vcmp_node213_address: 10.167.10.213
+    openstack_vcmp_node214_hostname: vcmp214
+    openstack_vcmp_node214_address: 10.167.10.214
+    openstack_vcmp_node215_hostname: vcmp215
+    openstack_vcmp_node215_address: 10.167.10.215
+    openstack_vcmp_node216_hostname: vcmp216
+    openstack_vcmp_node216_address: 10.167.10.216
+    openstack_vcmp_node217_hostname: vcmp217
+    openstack_vcmp_node217_address: 10.167.10.217
+    openstack_vcmp_node218_hostname: vcmp218
+    openstack_vcmp_node218_address: 10.167.10.218
+    openstack_vcmp_node219_hostname: vcmp219
+    openstack_vcmp_node219_address: 10.167.10.219
+    openstack_vcmp_node220_hostname: vcmp220
+    openstack_vcmp_node220_address: 10.167.10.220
+    openstack_vcmp_node221_hostname: vcmp221
+    openstack_vcmp_node221_address: 10.167.10.221
+    openstack_vcmp_node222_hostname: vcmp222
+    openstack_vcmp_node222_address: 10.167.10.222
+    openstack_vcmp_node223_hostname: vcmp223
+    openstack_vcmp_node223_address: 10.167.10.223
+    openstack_vcmp_node224_hostname: vcmp224
+    openstack_vcmp_node224_address: 10.167.10.224
+    openstack_vcmp_node225_hostname: vcmp225
+    openstack_vcmp_node225_address: 10.167.10.225
+    openstack_vcmp_node226_hostname: vcmp226
+    openstack_vcmp_node226_address: 10.167.10.226
+    openstack_vcmp_node227_hostname: vcmp227
+    openstack_vcmp_node227_address: 10.167.10.227
+    openstack_vcmp_node228_hostname: vcmp228
+    openstack_vcmp_node228_address: 10.167.10.228
+    openstack_vcmp_node229_hostname: vcmp229
+    openstack_vcmp_node229_address: 10.167.10.229
+    openstack_vcmp_node230_hostname: vcmp230
+    openstack_vcmp_node230_address: 10.167.10.230
+    openstack_vcmp_node231_hostname: vcmp231
+    openstack_vcmp_node231_address: 10.167.10.231
+    openstack_vcmp_node232_hostname: vcmp232
+    openstack_vcmp_node232_address: 10.167.10.232
+    openstack_vcmp_node233_hostname: vcmp233
+    openstack_vcmp_node233_address: 10.167.10.233
+    openstack_vcmp_node234_hostname: vcmp234
+    openstack_vcmp_node234_address: 10.167.10.234
+    openstack_vcmp_node235_hostname: vcmp235
+    openstack_vcmp_node235_address: 10.167.10.235
+    openstack_vcmp_node236_hostname: vcmp236
+    openstack_vcmp_node236_address: 10.167.10.236
+    openstack_vcmp_node237_hostname: vcmp237
+    openstack_vcmp_node237_address: 10.167.10.237
+    openstack_vcmp_node238_hostname: vcmp238
+    openstack_vcmp_node238_address: 10.167.10.238
+    openstack_vcmp_node239_hostname: vcmp239
+    openstack_vcmp_node239_address: 10.167.10.239
+    openstack_vcmp_node240_hostname: vcmp240
+    openstack_vcmp_node240_address: 10.167.10.240
+    openstack_vcmp_node241_hostname: vcmp241
+    openstack_vcmp_node241_address: 10.167.10.241
+    openstack_vcmp_node242_hostname: vcmp242
+    openstack_vcmp_node242_address: 10.167.10.242
+    openstack_vcmp_node243_hostname: vcmp243
+    openstack_vcmp_node243_address: 10.167.10.243
+    openstack_vcmp_node244_hostname: vcmp244
+    openstack_vcmp_node244_address: 10.167.10.244
+    openstack_vcmp_node245_hostname: vcmp245
+    openstack_vcmp_node245_address: 10.167.10.245
+    openstack_vcmp_node246_hostname: vcmp246
+    openstack_vcmp_node246_address: 10.167.10.246
+    openstack_vcmp_node247_hostname: vcmp247
+    openstack_vcmp_node247_address: 10.167.10.247
+    openstack_vcmp_node248_hostname: vcmp248
+    openstack_vcmp_node248_address: 10.167.10.248
+    openstack_vcmp_node249_hostname: vcmp249
+    openstack_vcmp_node249_address: 10.167.10.249
+    openstack_vcmp_node250_hostname: vcmp250
+    openstack_vcmp_node250_address: 10.167.10.250
+    openstack_vcmp_node251_hostname: vcmp251
+    openstack_vcmp_node251_address: 10.167.10.251
+    openstack_vcmp_node252_hostname: vcmp252
+    openstack_vcmp_node252_address: 10.167.10.252
+    openstack_vcmp_node253_hostname: vcmp253
+    openstack_vcmp_node253_address: 10.167.10.253
+    openstack_vcmp_node254_hostname: vcmp254
+    openstack_vcmp_node254_address: 10.167.10.254
+  linux:
+    network:
+      host:
+        vcmp3:
+          address: ${_param:openstack_vcmp_node3_address}
+          names:
+          - ${_param:openstack_vcmp_node3_hostname}
+          - ${_param:openstack_vcmp_node3_hostname}.${_param:cluster_domain}
+        vcmp4:
+          address: ${_param:openstack_vcmp_node4_address}
+          names:
+          - ${_param:openstack_vcmp_node4_hostname}
+          - ${_param:openstack_vcmp_node4_hostname}.${_param:cluster_domain}
+        vcmp5:
+          address: ${_param:openstack_vcmp_node5_address}
+          names:
+          - ${_param:openstack_vcmp_node5_hostname}
+          - ${_param:openstack_vcmp_node5_hostname}.${_param:cluster_domain}
+        vcmp6:
+          address: ${_param:openstack_vcmp_node6_address}
+          names:
+          - ${_param:openstack_vcmp_node6_hostname}
+          - ${_param:openstack_vcmp_node6_hostname}.${_param:cluster_domain}
+        vcmp7:
+          address: ${_param:openstack_vcmp_node7_address}
+          names:
+          - ${_param:openstack_vcmp_node7_hostname}
+          - ${_param:openstack_vcmp_node7_hostname}.${_param:cluster_domain}
+        vcmp8:
+          address: ${_param:openstack_vcmp_node8_address}
+          names:
+          - ${_param:openstack_vcmp_node8_hostname}
+          - ${_param:openstack_vcmp_node8_hostname}.${_param:cluster_domain}
+        vcmp9:
+          address: ${_param:openstack_vcmp_node9_address}
+          names:
+          - ${_param:openstack_vcmp_node9_hostname}
+          - ${_param:openstack_vcmp_node9_hostname}.${_param:cluster_domain}
+        vcmp10:
+          address: ${_param:openstack_vcmp_node10_address}
+          names:
+          - ${_param:openstack_vcmp_node10_hostname}
+          - ${_param:openstack_vcmp_node10_hostname}.${_param:cluster_domain}
+        vcmp11:
+          address: ${_param:openstack_vcmp_node11_address}
+          names:
+          - ${_param:openstack_vcmp_node11_hostname}
+          - ${_param:openstack_vcmp_node11_hostname}.${_param:cluster_domain}
+        vcmp12:
+          address: ${_param:openstack_vcmp_node12_address}
+          names:
+          - ${_param:openstack_vcmp_node12_hostname}
+          - ${_param:openstack_vcmp_node12_hostname}.${_param:cluster_domain}
+        vcmp13:
+          address: ${_param:openstack_vcmp_node13_address}
+          names:
+          - ${_param:openstack_vcmp_node13_hostname}
+          - ${_param:openstack_vcmp_node13_hostname}.${_param:cluster_domain}
+        vcmp14:
+          address: ${_param:openstack_vcmp_node14_address}
+          names:
+          - ${_param:openstack_vcmp_node14_hostname}
+          - ${_param:openstack_vcmp_node14_hostname}.${_param:cluster_domain}
+        vcmp15:
+          address: ${_param:openstack_vcmp_node15_address}
+          names:
+          - ${_param:openstack_vcmp_node15_hostname}
+          - ${_param:openstack_vcmp_node15_hostname}.${_param:cluster_domain}
+        vcmp16:
+          address: ${_param:openstack_vcmp_node16_address}
+          names:
+          - ${_param:openstack_vcmp_node16_hostname}
+          - ${_param:openstack_vcmp_node16_hostname}.${_param:cluster_domain}
+        vcmp17:
+          address: ${_param:openstack_vcmp_node17_address}
+          names:
+          - ${_param:openstack_vcmp_node17_hostname}
+          - ${_param:openstack_vcmp_node17_hostname}.${_param:cluster_domain}
+        vcmp18:
+          address: ${_param:openstack_vcmp_node18_address}
+          names:
+          - ${_param:openstack_vcmp_node18_hostname}
+          - ${_param:openstack_vcmp_node18_hostname}.${_param:cluster_domain}
+        vcmp19:
+          address: ${_param:openstack_vcmp_node19_address}
+          names:
+          - ${_param:openstack_vcmp_node19_hostname}
+          - ${_param:openstack_vcmp_node19_hostname}.${_param:cluster_domain}
+        vcmp20:
+          address: ${_param:openstack_vcmp_node20_address}
+          names:
+          - ${_param:openstack_vcmp_node20_hostname}
+          - ${_param:openstack_vcmp_node20_hostname}.${_param:cluster_domain}
+        vcmp21:
+          address: ${_param:openstack_vcmp_node21_address}
+          names:
+          - ${_param:openstack_vcmp_node21_hostname}
+          - ${_param:openstack_vcmp_node21_hostname}.${_param:cluster_domain}
+        vcmp22:
+          address: ${_param:openstack_vcmp_node22_address}
+          names:
+          - ${_param:openstack_vcmp_node22_hostname}
+          - ${_param:openstack_vcmp_node22_hostname}.${_param:cluster_domain}
+        vcmp23:
+          address: ${_param:openstack_vcmp_node23_address}
+          names:
+          - ${_param:openstack_vcmp_node23_hostname}
+          - ${_param:openstack_vcmp_node23_hostname}.${_param:cluster_domain}
+        vcmp24:
+          address: ${_param:openstack_vcmp_node24_address}
+          names:
+          - ${_param:openstack_vcmp_node24_hostname}
+          - ${_param:openstack_vcmp_node24_hostname}.${_param:cluster_domain}
+        vcmp25:
+          address: ${_param:openstack_vcmp_node25_address}
+          names:
+          - ${_param:openstack_vcmp_node25_hostname}
+          - ${_param:openstack_vcmp_node25_hostname}.${_param:cluster_domain}
+        vcmp26:
+          address: ${_param:openstack_vcmp_node26_address}
+          names:
+          - ${_param:openstack_vcmp_node26_hostname}
+          - ${_param:openstack_vcmp_node26_hostname}.${_param:cluster_domain}
+        vcmp27:
+          address: ${_param:openstack_vcmp_node27_address}
+          names:
+          - ${_param:openstack_vcmp_node27_hostname}
+          - ${_param:openstack_vcmp_node27_hostname}.${_param:cluster_domain}
+        vcmp28:
+          address: ${_param:openstack_vcmp_node28_address}
+          names:
+          - ${_param:openstack_vcmp_node28_hostname}
+          - ${_param:openstack_vcmp_node28_hostname}.${_param:cluster_domain}
+        vcmp29:
+          address: ${_param:openstack_vcmp_node29_address}
+          names:
+          - ${_param:openstack_vcmp_node29_hostname}
+          - ${_param:openstack_vcmp_node29_hostname}.${_param:cluster_domain}
+        vcmp30:
+          address: ${_param:openstack_vcmp_node30_address}
+          names:
+          - ${_param:openstack_vcmp_node30_hostname}
+          - ${_param:openstack_vcmp_node30_hostname}.${_param:cluster_domain}
+        vcmp31:
+          address: ${_param:openstack_vcmp_node31_address}
+          names:
+          - ${_param:openstack_vcmp_node31_hostname}
+          - ${_param:openstack_vcmp_node31_hostname}.${_param:cluster_domain}
+        vcmp32:
+          address: ${_param:openstack_vcmp_node32_address}
+          names:
+          - ${_param:openstack_vcmp_node32_hostname}
+          - ${_param:openstack_vcmp_node32_hostname}.${_param:cluster_domain}
+        vcmp33:
+          address: ${_param:openstack_vcmp_node33_address}
+          names:
+          - ${_param:openstack_vcmp_node33_hostname}
+          - ${_param:openstack_vcmp_node33_hostname}.${_param:cluster_domain}
+        vcmp34:
+          address: ${_param:openstack_vcmp_node34_address}
+          names:
+          - ${_param:openstack_vcmp_node34_hostname}
+          - ${_param:openstack_vcmp_node34_hostname}.${_param:cluster_domain}
+        vcmp35:
+          address: ${_param:openstack_vcmp_node35_address}
+          names:
+          - ${_param:openstack_vcmp_node35_hostname}
+          - ${_param:openstack_vcmp_node35_hostname}.${_param:cluster_domain}
+        vcmp36:
+          address: ${_param:openstack_vcmp_node36_address}
+          names:
+          - ${_param:openstack_vcmp_node36_hostname}
+          - ${_param:openstack_vcmp_node36_hostname}.${_param:cluster_domain}
+        vcmp37:
+          address: ${_param:openstack_vcmp_node37_address}
+          names:
+          - ${_param:openstack_vcmp_node37_hostname}
+          - ${_param:openstack_vcmp_node37_hostname}.${_param:cluster_domain}
+        vcmp38:
+          address: ${_param:openstack_vcmp_node38_address}
+          names:
+          - ${_param:openstack_vcmp_node38_hostname}
+          - ${_param:openstack_vcmp_node38_hostname}.${_param:cluster_domain}
+        vcmp39:
+          address: ${_param:openstack_vcmp_node39_address}
+          names:
+          - ${_param:openstack_vcmp_node39_hostname}
+          - ${_param:openstack_vcmp_node39_hostname}.${_param:cluster_domain}
+        vcmp40:
+          address: ${_param:openstack_vcmp_node40_address}
+          names:
+          - ${_param:openstack_vcmp_node40_hostname}
+          - ${_param:openstack_vcmp_node40_hostname}.${_param:cluster_domain}
+        vcmp41:
+          address: ${_param:openstack_vcmp_node41_address}
+          names:
+          - ${_param:openstack_vcmp_node41_hostname}
+          - ${_param:openstack_vcmp_node41_hostname}.${_param:cluster_domain}
+        vcmp42:
+          address: ${_param:openstack_vcmp_node42_address}
+          names:
+          - ${_param:openstack_vcmp_node42_hostname}
+          - ${_param:openstack_vcmp_node42_hostname}.${_param:cluster_domain}
+        vcmp43:
+          address: ${_param:openstack_vcmp_node43_address}
+          names:
+          - ${_param:openstack_vcmp_node43_hostname}
+          - ${_param:openstack_vcmp_node43_hostname}.${_param:cluster_domain}
+        vcmp44:
+          address: ${_param:openstack_vcmp_node44_address}
+          names:
+          - ${_param:openstack_vcmp_node44_hostname}
+          - ${_param:openstack_vcmp_node44_hostname}.${_param:cluster_domain}
+        vcmp45:
+          address: ${_param:openstack_vcmp_node45_address}
+          names:
+          - ${_param:openstack_vcmp_node45_hostname}
+          - ${_param:openstack_vcmp_node45_hostname}.${_param:cluster_domain}
+        vcmp46:
+          address: ${_param:openstack_vcmp_node46_address}
+          names:
+          - ${_param:openstack_vcmp_node46_hostname}
+          - ${_param:openstack_vcmp_node46_hostname}.${_param:cluster_domain}
+        vcmp47:
+          address: ${_param:openstack_vcmp_node47_address}
+          names:
+          - ${_param:openstack_vcmp_node47_hostname}
+          - ${_param:openstack_vcmp_node47_hostname}.${_param:cluster_domain}
+        vcmp48:
+          address: ${_param:openstack_vcmp_node48_address}
+          names:
+          - ${_param:openstack_vcmp_node48_hostname}
+          - ${_param:openstack_vcmp_node48_hostname}.${_param:cluster_domain}
+        vcmp49:
+          address: ${_param:openstack_vcmp_node49_address}
+          names:
+          - ${_param:openstack_vcmp_node49_hostname}
+          - ${_param:openstack_vcmp_node49_hostname}.${_param:cluster_domain}
+        vcmp50:
+          address: ${_param:openstack_vcmp_node50_address}
+          names:
+          - ${_param:openstack_vcmp_node50_hostname}
+          - ${_param:openstack_vcmp_node50_hostname}.${_param:cluster_domain}
+        vcmp51:
+          address: ${_param:openstack_vcmp_node51_address}
+          names:
+          - ${_param:openstack_vcmp_node51_hostname}
+          - ${_param:openstack_vcmp_node51_hostname}.${_param:cluster_domain}
+        vcmp52:
+          address: ${_param:openstack_vcmp_node52_address}
+          names:
+          - ${_param:openstack_vcmp_node52_hostname}
+          - ${_param:openstack_vcmp_node52_hostname}.${_param:cluster_domain}
+        vcmp53:
+          address: ${_param:openstack_vcmp_node53_address}
+          names:
+          - ${_param:openstack_vcmp_node53_hostname}
+          - ${_param:openstack_vcmp_node53_hostname}.${_param:cluster_domain}
+        vcmp54:
+          address: ${_param:openstack_vcmp_node54_address}
+          names:
+          - ${_param:openstack_vcmp_node54_hostname}
+          - ${_param:openstack_vcmp_node54_hostname}.${_param:cluster_domain}
+        vcmp55:
+          address: ${_param:openstack_vcmp_node55_address}
+          names:
+          - ${_param:openstack_vcmp_node55_hostname}
+          - ${_param:openstack_vcmp_node55_hostname}.${_param:cluster_domain}
+        vcmp56:
+          address: ${_param:openstack_vcmp_node56_address}
+          names:
+          - ${_param:openstack_vcmp_node56_hostname}
+          - ${_param:openstack_vcmp_node56_hostname}.${_param:cluster_domain}
+        vcmp57:
+          address: ${_param:openstack_vcmp_node57_address}
+          names:
+          - ${_param:openstack_vcmp_node57_hostname}
+          - ${_param:openstack_vcmp_node57_hostname}.${_param:cluster_domain}
+        vcmp58:
+          address: ${_param:openstack_vcmp_node58_address}
+          names:
+          - ${_param:openstack_vcmp_node58_hostname}
+          - ${_param:openstack_vcmp_node58_hostname}.${_param:cluster_domain}
+        vcmp59:
+          address: ${_param:openstack_vcmp_node59_address}
+          names:
+          - ${_param:openstack_vcmp_node59_hostname}
+          - ${_param:openstack_vcmp_node59_hostname}.${_param:cluster_domain}
+        vcmp60:
+          address: ${_param:openstack_vcmp_node60_address}
+          names:
+          - ${_param:openstack_vcmp_node60_hostname}
+          - ${_param:openstack_vcmp_node60_hostname}.${_param:cluster_domain}
+        vcmp61:
+          address: ${_param:openstack_vcmp_node61_address}
+          names:
+          - ${_param:openstack_vcmp_node61_hostname}
+          - ${_param:openstack_vcmp_node61_hostname}.${_param:cluster_domain}
+        vcmp62:
+          address: ${_param:openstack_vcmp_node62_address}
+          names:
+          - ${_param:openstack_vcmp_node62_hostname}
+          - ${_param:openstack_vcmp_node62_hostname}.${_param:cluster_domain}
+        vcmp63:
+          address: ${_param:openstack_vcmp_node63_address}
+          names:
+          - ${_param:openstack_vcmp_node63_hostname}
+          - ${_param:openstack_vcmp_node63_hostname}.${_param:cluster_domain}
+        vcmp64:
+          address: ${_param:openstack_vcmp_node64_address}
+          names:
+          - ${_param:openstack_vcmp_node64_hostname}
+          - ${_param:openstack_vcmp_node64_hostname}.${_param:cluster_domain}
+        vcmp65:
+          address: ${_param:openstack_vcmp_node65_address}
+          names:
+          - ${_param:openstack_vcmp_node65_hostname}
+          - ${_param:openstack_vcmp_node65_hostname}.${_param:cluster_domain}
+        vcmp66:
+          address: ${_param:openstack_vcmp_node66_address}
+          names:
+          - ${_param:openstack_vcmp_node66_hostname}
+          - ${_param:openstack_vcmp_node66_hostname}.${_param:cluster_domain}
+        vcmp67:
+          address: ${_param:openstack_vcmp_node67_address}
+          names:
+          - ${_param:openstack_vcmp_node67_hostname}
+          - ${_param:openstack_vcmp_node67_hostname}.${_param:cluster_domain}
+        vcmp68:
+          address: ${_param:openstack_vcmp_node68_address}
+          names:
+          - ${_param:openstack_vcmp_node68_hostname}
+          - ${_param:openstack_vcmp_node68_hostname}.${_param:cluster_domain}
+        vcmp69:
+          address: ${_param:openstack_vcmp_node69_address}
+          names:
+          - ${_param:openstack_vcmp_node69_hostname}
+          - ${_param:openstack_vcmp_node69_hostname}.${_param:cluster_domain}
+        vcmp70:
+          address: ${_param:openstack_vcmp_node70_address}
+          names:
+          - ${_param:openstack_vcmp_node70_hostname}
+          - ${_param:openstack_vcmp_node70_hostname}.${_param:cluster_domain}
+        vcmp71:
+          address: ${_param:openstack_vcmp_node71_address}
+          names:
+          - ${_param:openstack_vcmp_node71_hostname}
+          - ${_param:openstack_vcmp_node71_hostname}.${_param:cluster_domain}
+        vcmp72:
+          address: ${_param:openstack_vcmp_node72_address}
+          names:
+          - ${_param:openstack_vcmp_node72_hostname}
+          - ${_param:openstack_vcmp_node72_hostname}.${_param:cluster_domain}
+        vcmp73:
+          address: ${_param:openstack_vcmp_node73_address}
+          names:
+          - ${_param:openstack_vcmp_node73_hostname}
+          - ${_param:openstack_vcmp_node73_hostname}.${_param:cluster_domain}
+        vcmp74:
+          address: ${_param:openstack_vcmp_node74_address}
+          names:
+          - ${_param:openstack_vcmp_node74_hostname}
+          - ${_param:openstack_vcmp_node74_hostname}.${_param:cluster_domain}
+        vcmp75:
+          address: ${_param:openstack_vcmp_node75_address}
+          names:
+          - ${_param:openstack_vcmp_node75_hostname}
+          - ${_param:openstack_vcmp_node75_hostname}.${_param:cluster_domain}
+        vcmp76:
+          address: ${_param:openstack_vcmp_node76_address}
+          names:
+          - ${_param:openstack_vcmp_node76_hostname}
+          - ${_param:openstack_vcmp_node76_hostname}.${_param:cluster_domain}
+        vcmp77:
+          address: ${_param:openstack_vcmp_node77_address}
+          names:
+          - ${_param:openstack_vcmp_node77_hostname}
+          - ${_param:openstack_vcmp_node77_hostname}.${_param:cluster_domain}
+        vcmp78:
+          address: ${_param:openstack_vcmp_node78_address}
+          names:
+          - ${_param:openstack_vcmp_node78_hostname}
+          - ${_param:openstack_vcmp_node78_hostname}.${_param:cluster_domain}
+        vcmp79:
+          address: ${_param:openstack_vcmp_node79_address}
+          names:
+          - ${_param:openstack_vcmp_node79_hostname}
+          - ${_param:openstack_vcmp_node79_hostname}.${_param:cluster_domain}
+        vcmp80:
+          address: ${_param:openstack_vcmp_node80_address}
+          names:
+          - ${_param:openstack_vcmp_node80_hostname}
+          - ${_param:openstack_vcmp_node80_hostname}.${_param:cluster_domain}
+        vcmp81:
+          address: ${_param:openstack_vcmp_node81_address}
+          names:
+          - ${_param:openstack_vcmp_node81_hostname}
+          - ${_param:openstack_vcmp_node81_hostname}.${_param:cluster_domain}
+        vcmp82:
+          address: ${_param:openstack_vcmp_node82_address}
+          names:
+          - ${_param:openstack_vcmp_node82_hostname}
+          - ${_param:openstack_vcmp_node82_hostname}.${_param:cluster_domain}
+        vcmp83:
+          address: ${_param:openstack_vcmp_node83_address}
+          names:
+          - ${_param:openstack_vcmp_node83_hostname}
+          - ${_param:openstack_vcmp_node83_hostname}.${_param:cluster_domain}
+        vcmp84:
+          address: ${_param:openstack_vcmp_node84_address}
+          names:
+          - ${_param:openstack_vcmp_node84_hostname}
+          - ${_param:openstack_vcmp_node84_hostname}.${_param:cluster_domain}
+        vcmp85:
+          address: ${_param:openstack_vcmp_node85_address}
+          names:
+          - ${_param:openstack_vcmp_node85_hostname}
+          - ${_param:openstack_vcmp_node85_hostname}.${_param:cluster_domain}
+        vcmp86:
+          address: ${_param:openstack_vcmp_node86_address}
+          names:
+          - ${_param:openstack_vcmp_node86_hostname}
+          - ${_param:openstack_vcmp_node86_hostname}.${_param:cluster_domain}
+        vcmp87:
+          address: ${_param:openstack_vcmp_node87_address}
+          names:
+          - ${_param:openstack_vcmp_node87_hostname}
+          - ${_param:openstack_vcmp_node87_hostname}.${_param:cluster_domain}
+        vcmp88:
+          address: ${_param:openstack_vcmp_node88_address}
+          names:
+          - ${_param:openstack_vcmp_node88_hostname}
+          - ${_param:openstack_vcmp_node88_hostname}.${_param:cluster_domain}
+        vcmp89:
+          address: ${_param:openstack_vcmp_node89_address}
+          names:
+          - ${_param:openstack_vcmp_node89_hostname}
+          - ${_param:openstack_vcmp_node89_hostname}.${_param:cluster_domain}
+        vcmp90:
+          address: ${_param:openstack_vcmp_node90_address}
+          names:
+          - ${_param:openstack_vcmp_node90_hostname}
+          - ${_param:openstack_vcmp_node90_hostname}.${_param:cluster_domain}
+        vcmp91:
+          address: ${_param:openstack_vcmp_node91_address}
+          names:
+          - ${_param:openstack_vcmp_node91_hostname}
+          - ${_param:openstack_vcmp_node91_hostname}.${_param:cluster_domain}
+        vcmp92:
+          address: ${_param:openstack_vcmp_node92_address}
+          names:
+          - ${_param:openstack_vcmp_node92_hostname}
+          - ${_param:openstack_vcmp_node92_hostname}.${_param:cluster_domain}
+        vcmp93:
+          address: ${_param:openstack_vcmp_node93_address}
+          names:
+          - ${_param:openstack_vcmp_node93_hostname}
+          - ${_param:openstack_vcmp_node93_hostname}.${_param:cluster_domain}
+        vcmp94:
+          address: ${_param:openstack_vcmp_node94_address}
+          names:
+          - ${_param:openstack_vcmp_node94_hostname}
+          - ${_param:openstack_vcmp_node94_hostname}.${_param:cluster_domain}
+        vcmp95:
+          address: ${_param:openstack_vcmp_node95_address}
+          names:
+          - ${_param:openstack_vcmp_node95_hostname}
+          - ${_param:openstack_vcmp_node95_hostname}.${_param:cluster_domain}
+        vcmp96:
+          address: ${_param:openstack_vcmp_node96_address}
+          names:
+          - ${_param:openstack_vcmp_node96_hostname}
+          - ${_param:openstack_vcmp_node96_hostname}.${_param:cluster_domain}
+        vcmp97:
+          address: ${_param:openstack_vcmp_node97_address}
+          names:
+          - ${_param:openstack_vcmp_node97_hostname}
+          - ${_param:openstack_vcmp_node97_hostname}.${_param:cluster_domain}
+        vcmp98:
+          address: ${_param:openstack_vcmp_node98_address}
+          names:
+          - ${_param:openstack_vcmp_node98_hostname}
+          - ${_param:openstack_vcmp_node98_hostname}.${_param:cluster_domain}
+        vcmp99:
+          address: ${_param:openstack_vcmp_node99_address}
+          names:
+          - ${_param:openstack_vcmp_node99_hostname}
+          - ${_param:openstack_vcmp_node99_hostname}.${_param:cluster_domain}
+        vcmp100:
+          address: ${_param:openstack_vcmp_node100_address}
+          names:
+          - ${_param:openstack_vcmp_node100_hostname}
+          - ${_param:openstack_vcmp_node100_hostname}.${_param:cluster_domain}
+        vcmp101:
+          address: ${_param:openstack_vcmp_node101_address}
+          names:
+          - ${_param:openstack_vcmp_node101_hostname}
+          - ${_param:openstack_vcmp_node101_hostname}.${_param:cluster_domain}
+        vcmp102:
+          address: ${_param:openstack_vcmp_node102_address}
+          names:
+          - ${_param:openstack_vcmp_node102_hostname}
+          - ${_param:openstack_vcmp_node102_hostname}.${_param:cluster_domain}
+        vcmp103:
+          address: ${_param:openstack_vcmp_node103_address}
+          names:
+          - ${_param:openstack_vcmp_node103_hostname}
+          - ${_param:openstack_vcmp_node103_hostname}.${_param:cluster_domain}
+        vcmp104:
+          address: ${_param:openstack_vcmp_node104_address}
+          names:
+          - ${_param:openstack_vcmp_node104_hostname}
+          - ${_param:openstack_vcmp_node104_hostname}.${_param:cluster_domain}
+        vcmp105:
+          address: ${_param:openstack_vcmp_node105_address}
+          names:
+          - ${_param:openstack_vcmp_node105_hostname}
+          - ${_param:openstack_vcmp_node105_hostname}.${_param:cluster_domain}
+        vcmp106:
+          address: ${_param:openstack_vcmp_node106_address}
+          names:
+          - ${_param:openstack_vcmp_node106_hostname}
+          - ${_param:openstack_vcmp_node106_hostname}.${_param:cluster_domain}
+        vcmp107:
+          address: ${_param:openstack_vcmp_node107_address}
+          names:
+          - ${_param:openstack_vcmp_node107_hostname}
+          - ${_param:openstack_vcmp_node107_hostname}.${_param:cluster_domain}
+        vcmp108:
+          address: ${_param:openstack_vcmp_node108_address}
+          names:
+          - ${_param:openstack_vcmp_node108_hostname}
+          - ${_param:openstack_vcmp_node108_hostname}.${_param:cluster_domain}
+        vcmp109:
+          address: ${_param:openstack_vcmp_node109_address}
+          names:
+          - ${_param:openstack_vcmp_node109_hostname}
+          - ${_param:openstack_vcmp_node109_hostname}.${_param:cluster_domain}
+        vcmp110:
+          address: ${_param:openstack_vcmp_node110_address}
+          names:
+          - ${_param:openstack_vcmp_node110_hostname}
+          - ${_param:openstack_vcmp_node110_hostname}.${_param:cluster_domain}
+        vcmp111:
+          address: ${_param:openstack_vcmp_node111_address}
+          names:
+          - ${_param:openstack_vcmp_node111_hostname}
+          - ${_param:openstack_vcmp_node111_hostname}.${_param:cluster_domain}
+        vcmp112:
+          address: ${_param:openstack_vcmp_node112_address}
+          names:
+          - ${_param:openstack_vcmp_node112_hostname}
+          - ${_param:openstack_vcmp_node112_hostname}.${_param:cluster_domain}
+        vcmp113:
+          address: ${_param:openstack_vcmp_node113_address}
+          names:
+          - ${_param:openstack_vcmp_node113_hostname}
+          - ${_param:openstack_vcmp_node113_hostname}.${_param:cluster_domain}
+        vcmp114:
+          address: ${_param:openstack_vcmp_node114_address}
+          names:
+          - ${_param:openstack_vcmp_node114_hostname}
+          - ${_param:openstack_vcmp_node114_hostname}.${_param:cluster_domain}
+        vcmp115:
+          address: ${_param:openstack_vcmp_node115_address}
+          names:
+          - ${_param:openstack_vcmp_node115_hostname}
+          - ${_param:openstack_vcmp_node115_hostname}.${_param:cluster_domain}
+        vcmp116:
+          address: ${_param:openstack_vcmp_node116_address}
+          names:
+          - ${_param:openstack_vcmp_node116_hostname}
+          - ${_param:openstack_vcmp_node116_hostname}.${_param:cluster_domain}
+        vcmp117:
+          address: ${_param:openstack_vcmp_node117_address}
+          names:
+          - ${_param:openstack_vcmp_node117_hostname}
+          - ${_param:openstack_vcmp_node117_hostname}.${_param:cluster_domain}
+        vcmp118:
+          address: ${_param:openstack_vcmp_node118_address}
+          names:
+          - ${_param:openstack_vcmp_node118_hostname}
+          - ${_param:openstack_vcmp_node118_hostname}.${_param:cluster_domain}
+        vcmp119:
+          address: ${_param:openstack_vcmp_node119_address}
+          names:
+          - ${_param:openstack_vcmp_node119_hostname}
+          - ${_param:openstack_vcmp_node119_hostname}.${_param:cluster_domain}
+        vcmp120:
+          address: ${_param:openstack_vcmp_node120_address}
+          names:
+          - ${_param:openstack_vcmp_node120_hostname}
+          - ${_param:openstack_vcmp_node120_hostname}.${_param:cluster_domain}
+        vcmp121:
+          address: ${_param:openstack_vcmp_node121_address}
+          names:
+          - ${_param:openstack_vcmp_node121_hostname}
+          - ${_param:openstack_vcmp_node121_hostname}.${_param:cluster_domain}
+        vcmp122:
+          address: ${_param:openstack_vcmp_node122_address}
+          names:
+          - ${_param:openstack_vcmp_node122_hostname}
+          - ${_param:openstack_vcmp_node122_hostname}.${_param:cluster_domain}
+        vcmp123:
+          address: ${_param:openstack_vcmp_node123_address}
+          names:
+          - ${_param:openstack_vcmp_node123_hostname}
+          - ${_param:openstack_vcmp_node123_hostname}.${_param:cluster_domain}
+        vcmp124:
+          address: ${_param:openstack_vcmp_node124_address}
+          names:
+          - ${_param:openstack_vcmp_node124_hostname}
+          - ${_param:openstack_vcmp_node124_hostname}.${_param:cluster_domain}
+        vcmp125:
+          address: ${_param:openstack_vcmp_node125_address}
+          names:
+          - ${_param:openstack_vcmp_node125_hostname}
+          - ${_param:openstack_vcmp_node125_hostname}.${_param:cluster_domain}
+        vcmp126:
+          address: ${_param:openstack_vcmp_node126_address}
+          names:
+          - ${_param:openstack_vcmp_node126_hostname}
+          - ${_param:openstack_vcmp_node126_hostname}.${_param:cluster_domain}
+        vcmp127:
+          address: ${_param:openstack_vcmp_node127_address}
+          names:
+          - ${_param:openstack_vcmp_node127_hostname}
+          - ${_param:openstack_vcmp_node127_hostname}.${_param:cluster_domain}
+        vcmp128:
+          address: ${_param:openstack_vcmp_node128_address}
+          names:
+          - ${_param:openstack_vcmp_node128_hostname}
+          - ${_param:openstack_vcmp_node128_hostname}.${_param:cluster_domain}
+        vcmp129:
+          address: ${_param:openstack_vcmp_node129_address}
+          names:
+          - ${_param:openstack_vcmp_node129_hostname}
+          - ${_param:openstack_vcmp_node129_hostname}.${_param:cluster_domain}
+        vcmp130:
+          address: ${_param:openstack_vcmp_node130_address}
+          names:
+          - ${_param:openstack_vcmp_node130_hostname}
+          - ${_param:openstack_vcmp_node130_hostname}.${_param:cluster_domain}
+        vcmp131:
+          address: ${_param:openstack_vcmp_node131_address}
+          names:
+          - ${_param:openstack_vcmp_node131_hostname}
+          - ${_param:openstack_vcmp_node131_hostname}.${_param:cluster_domain}
+        vcmp132:
+          address: ${_param:openstack_vcmp_node132_address}
+          names:
+          - ${_param:openstack_vcmp_node132_hostname}
+          - ${_param:openstack_vcmp_node132_hostname}.${_param:cluster_domain}
+        vcmp133:
+          address: ${_param:openstack_vcmp_node133_address}
+          names:
+          - ${_param:openstack_vcmp_node133_hostname}
+          - ${_param:openstack_vcmp_node133_hostname}.${_param:cluster_domain}
+        vcmp134:
+          address: ${_param:openstack_vcmp_node134_address}
+          names:
+          - ${_param:openstack_vcmp_node134_hostname}
+          - ${_param:openstack_vcmp_node134_hostname}.${_param:cluster_domain}
+        vcmp135:
+          address: ${_param:openstack_vcmp_node135_address}
+          names:
+          - ${_param:openstack_vcmp_node135_hostname}
+          - ${_param:openstack_vcmp_node135_hostname}.${_param:cluster_domain}
+        vcmp136:
+          address: ${_param:openstack_vcmp_node136_address}
+          names:
+          - ${_param:openstack_vcmp_node136_hostname}
+          - ${_param:openstack_vcmp_node136_hostname}.${_param:cluster_domain}
+        vcmp137:
+          address: ${_param:openstack_vcmp_node137_address}
+          names:
+          - ${_param:openstack_vcmp_node137_hostname}
+          - ${_param:openstack_vcmp_node137_hostname}.${_param:cluster_domain}
+        vcmp138:
+          address: ${_param:openstack_vcmp_node138_address}
+          names:
+          - ${_param:openstack_vcmp_node138_hostname}
+          - ${_param:openstack_vcmp_node138_hostname}.${_param:cluster_domain}
+        vcmp139:
+          address: ${_param:openstack_vcmp_node139_address}
+          names:
+          - ${_param:openstack_vcmp_node139_hostname}
+          - ${_param:openstack_vcmp_node139_hostname}.${_param:cluster_domain}
+        vcmp140:
+          address: ${_param:openstack_vcmp_node140_address}
+          names:
+          - ${_param:openstack_vcmp_node140_hostname}
+          - ${_param:openstack_vcmp_node140_hostname}.${_param:cluster_domain}
+        vcmp141:
+          address: ${_param:openstack_vcmp_node141_address}
+          names:
+          - ${_param:openstack_vcmp_node141_hostname}
+          - ${_param:openstack_vcmp_node141_hostname}.${_param:cluster_domain}
+        vcmp142:
+          address: ${_param:openstack_vcmp_node142_address}
+          names:
+          - ${_param:openstack_vcmp_node142_hostname}
+          - ${_param:openstack_vcmp_node142_hostname}.${_param:cluster_domain}
+        vcmp143:
+          address: ${_param:openstack_vcmp_node143_address}
+          names:
+          - ${_param:openstack_vcmp_node143_hostname}
+          - ${_param:openstack_vcmp_node143_hostname}.${_param:cluster_domain}
+        vcmp144:
+          address: ${_param:openstack_vcmp_node144_address}
+          names:
+          - ${_param:openstack_vcmp_node144_hostname}
+          - ${_param:openstack_vcmp_node144_hostname}.${_param:cluster_domain}
+        vcmp145:
+          address: ${_param:openstack_vcmp_node145_address}
+          names:
+          - ${_param:openstack_vcmp_node145_hostname}
+          - ${_param:openstack_vcmp_node145_hostname}.${_param:cluster_domain}
+        vcmp146:
+          address: ${_param:openstack_vcmp_node146_address}
+          names:
+          - ${_param:openstack_vcmp_node146_hostname}
+          - ${_param:openstack_vcmp_node146_hostname}.${_param:cluster_domain}
+        vcmp147:
+          address: ${_param:openstack_vcmp_node147_address}
+          names:
+          - ${_param:openstack_vcmp_node147_hostname}
+          - ${_param:openstack_vcmp_node147_hostname}.${_param:cluster_domain}
+        vcmp148:
+          address: ${_param:openstack_vcmp_node148_address}
+          names:
+          - ${_param:openstack_vcmp_node148_hostname}
+          - ${_param:openstack_vcmp_node148_hostname}.${_param:cluster_domain}
+        vcmp149:
+          address: ${_param:openstack_vcmp_node149_address}
+          names:
+          - ${_param:openstack_vcmp_node149_hostname}
+          - ${_param:openstack_vcmp_node149_hostname}.${_param:cluster_domain}
+        vcmp150:
+          address: ${_param:openstack_vcmp_node150_address}
+          names:
+          - ${_param:openstack_vcmp_node150_hostname}
+          - ${_param:openstack_vcmp_node150_hostname}.${_param:cluster_domain}
+        vcmp151:
+          address: ${_param:openstack_vcmp_node151_address}
+          names:
+          - ${_param:openstack_vcmp_node151_hostname}
+          - ${_param:openstack_vcmp_node151_hostname}.${_param:cluster_domain}
+        vcmp152:
+          address: ${_param:openstack_vcmp_node152_address}
+          names:
+          - ${_param:openstack_vcmp_node152_hostname}
+          - ${_param:openstack_vcmp_node152_hostname}.${_param:cluster_domain}
+        vcmp153:
+          address: ${_param:openstack_vcmp_node153_address}
+          names:
+          - ${_param:openstack_vcmp_node153_hostname}
+          - ${_param:openstack_vcmp_node153_hostname}.${_param:cluster_domain}
+        vcmp154:
+          address: ${_param:openstack_vcmp_node154_address}
+          names:
+          - ${_param:openstack_vcmp_node154_hostname}
+          - ${_param:openstack_vcmp_node154_hostname}.${_param:cluster_domain}
+        vcmp155:
+          address: ${_param:openstack_vcmp_node155_address}
+          names:
+          - ${_param:openstack_vcmp_node155_hostname}
+          - ${_param:openstack_vcmp_node155_hostname}.${_param:cluster_domain}
+        vcmp156:
+          address: ${_param:openstack_vcmp_node156_address}
+          names:
+          - ${_param:openstack_vcmp_node156_hostname}
+          - ${_param:openstack_vcmp_node156_hostname}.${_param:cluster_domain}
+        vcmp157:
+          address: ${_param:openstack_vcmp_node157_address}
+          names:
+          - ${_param:openstack_vcmp_node157_hostname}
+          - ${_param:openstack_vcmp_node157_hostname}.${_param:cluster_domain}
+        vcmp158:
+          address: ${_param:openstack_vcmp_node158_address}
+          names:
+          - ${_param:openstack_vcmp_node158_hostname}
+          - ${_param:openstack_vcmp_node158_hostname}.${_param:cluster_domain}
+        vcmp159:
+          address: ${_param:openstack_vcmp_node159_address}
+          names:
+          - ${_param:openstack_vcmp_node159_hostname}
+          - ${_param:openstack_vcmp_node159_hostname}.${_param:cluster_domain}
+        vcmp160:
+          address: ${_param:openstack_vcmp_node160_address}
+          names:
+          - ${_param:openstack_vcmp_node160_hostname}
+          - ${_param:openstack_vcmp_node160_hostname}.${_param:cluster_domain}
+        vcmp161:
+          address: ${_param:openstack_vcmp_node161_address}
+          names:
+          - ${_param:openstack_vcmp_node161_hostname}
+          - ${_param:openstack_vcmp_node161_hostname}.${_param:cluster_domain}
+        vcmp162:
+          address: ${_param:openstack_vcmp_node162_address}
+          names:
+          - ${_param:openstack_vcmp_node162_hostname}
+          - ${_param:openstack_vcmp_node162_hostname}.${_param:cluster_domain}
+        vcmp163:
+          address: ${_param:openstack_vcmp_node163_address}
+          names:
+          - ${_param:openstack_vcmp_node163_hostname}
+          - ${_param:openstack_vcmp_node163_hostname}.${_param:cluster_domain}
+        vcmp164:
+          address: ${_param:openstack_vcmp_node164_address}
+          names:
+          - ${_param:openstack_vcmp_node164_hostname}
+          - ${_param:openstack_vcmp_node164_hostname}.${_param:cluster_domain}
+        vcmp165:
+          address: ${_param:openstack_vcmp_node165_address}
+          names:
+          - ${_param:openstack_vcmp_node165_hostname}
+          - ${_param:openstack_vcmp_node165_hostname}.${_param:cluster_domain}
+        vcmp166:
+          address: ${_param:openstack_vcmp_node166_address}
+          names:
+          - ${_param:openstack_vcmp_node166_hostname}
+          - ${_param:openstack_vcmp_node166_hostname}.${_param:cluster_domain}
+        vcmp167:
+          address: ${_param:openstack_vcmp_node167_address}
+          names:
+          - ${_param:openstack_vcmp_node167_hostname}
+          - ${_param:openstack_vcmp_node167_hostname}.${_param:cluster_domain}
+        vcmp168:
+          address: ${_param:openstack_vcmp_node168_address}
+          names:
+          - ${_param:openstack_vcmp_node168_hostname}
+          - ${_param:openstack_vcmp_node168_hostname}.${_param:cluster_domain}
+        vcmp169:
+          address: ${_param:openstack_vcmp_node169_address}
+          names:
+          - ${_param:openstack_vcmp_node169_hostname}
+          - ${_param:openstack_vcmp_node169_hostname}.${_param:cluster_domain}
+        vcmp170:
+          address: ${_param:openstack_vcmp_node170_address}
+          names:
+          - ${_param:openstack_vcmp_node170_hostname}
+          - ${_param:openstack_vcmp_node170_hostname}.${_param:cluster_domain}
+        vcmp171:
+          address: ${_param:openstack_vcmp_node171_address}
+          names:
+          - ${_param:openstack_vcmp_node171_hostname}
+          - ${_param:openstack_vcmp_node171_hostname}.${_param:cluster_domain}
+        vcmp172:
+          address: ${_param:openstack_vcmp_node172_address}
+          names:
+          - ${_param:openstack_vcmp_node172_hostname}
+          - ${_param:openstack_vcmp_node172_hostname}.${_param:cluster_domain}
+        vcmp173:
+          address: ${_param:openstack_vcmp_node173_address}
+          names:
+          - ${_param:openstack_vcmp_node173_hostname}
+          - ${_param:openstack_vcmp_node173_hostname}.${_param:cluster_domain}
+        vcmp174:
+          address: ${_param:openstack_vcmp_node174_address}
+          names:
+          - ${_param:openstack_vcmp_node174_hostname}
+          - ${_param:openstack_vcmp_node174_hostname}.${_param:cluster_domain}
+        vcmp175:
+          address: ${_param:openstack_vcmp_node175_address}
+          names:
+          - ${_param:openstack_vcmp_node175_hostname}
+          - ${_param:openstack_vcmp_node175_hostname}.${_param:cluster_domain}
+        vcmp176:
+          address: ${_param:openstack_vcmp_node176_address}
+          names:
+          - ${_param:openstack_vcmp_node176_hostname}
+          - ${_param:openstack_vcmp_node176_hostname}.${_param:cluster_domain}
+        vcmp177:
+          address: ${_param:openstack_vcmp_node177_address}
+          names:
+          - ${_param:openstack_vcmp_node177_hostname}
+          - ${_param:openstack_vcmp_node177_hostname}.${_param:cluster_domain}
+        vcmp178:
+          address: ${_param:openstack_vcmp_node178_address}
+          names:
+          - ${_param:openstack_vcmp_node178_hostname}
+          - ${_param:openstack_vcmp_node178_hostname}.${_param:cluster_domain}
+        vcmp179:
+          address: ${_param:openstack_vcmp_node179_address}
+          names:
+          - ${_param:openstack_vcmp_node179_hostname}
+          - ${_param:openstack_vcmp_node179_hostname}.${_param:cluster_domain}
+        vcmp180:
+          address: ${_param:openstack_vcmp_node180_address}
+          names:
+          - ${_param:openstack_vcmp_node180_hostname}
+          - ${_param:openstack_vcmp_node180_hostname}.${_param:cluster_domain}
+        vcmp181:
+          address: ${_param:openstack_vcmp_node181_address}
+          names:
+          - ${_param:openstack_vcmp_node181_hostname}
+          - ${_param:openstack_vcmp_node181_hostname}.${_param:cluster_domain}
+        vcmp182:
+          address: ${_param:openstack_vcmp_node182_address}
+          names:
+          - ${_param:openstack_vcmp_node182_hostname}
+          - ${_param:openstack_vcmp_node182_hostname}.${_param:cluster_domain}
+        vcmp183:
+          address: ${_param:openstack_vcmp_node183_address}
+          names:
+          - ${_param:openstack_vcmp_node183_hostname}
+          - ${_param:openstack_vcmp_node183_hostname}.${_param:cluster_domain}
+        vcmp184:
+          address: ${_param:openstack_vcmp_node184_address}
+          names:
+          - ${_param:openstack_vcmp_node184_hostname}
+          - ${_param:openstack_vcmp_node184_hostname}.${_param:cluster_domain}
+        vcmp185:
+          address: ${_param:openstack_vcmp_node185_address}
+          names:
+          - ${_param:openstack_vcmp_node185_hostname}
+          - ${_param:openstack_vcmp_node185_hostname}.${_param:cluster_domain}
+        vcmp186:
+          address: ${_param:openstack_vcmp_node186_address}
+          names:
+          - ${_param:openstack_vcmp_node186_hostname}
+          - ${_param:openstack_vcmp_node186_hostname}.${_param:cluster_domain}
+        vcmp187:
+          address: ${_param:openstack_vcmp_node187_address}
+          names:
+          - ${_param:openstack_vcmp_node187_hostname}
+          - ${_param:openstack_vcmp_node187_hostname}.${_param:cluster_domain}
+        vcmp188:
+          address: ${_param:openstack_vcmp_node188_address}
+          names:
+          - ${_param:openstack_vcmp_node188_hostname}
+          - ${_param:openstack_vcmp_node188_hostname}.${_param:cluster_domain}
+        vcmp189:
+          address: ${_param:openstack_vcmp_node189_address}
+          names:
+          - ${_param:openstack_vcmp_node189_hostname}
+          - ${_param:openstack_vcmp_node189_hostname}.${_param:cluster_domain}
+        vcmp190:
+          address: ${_param:openstack_vcmp_node190_address}
+          names:
+          - ${_param:openstack_vcmp_node190_hostname}
+          - ${_param:openstack_vcmp_node190_hostname}.${_param:cluster_domain}
+        vcmp191:
+          address: ${_param:openstack_vcmp_node191_address}
+          names:
+          - ${_param:openstack_vcmp_node191_hostname}
+          - ${_param:openstack_vcmp_node191_hostname}.${_param:cluster_domain}
+        vcmp192:
+          address: ${_param:openstack_vcmp_node192_address}
+          names:
+          - ${_param:openstack_vcmp_node192_hostname}
+          - ${_param:openstack_vcmp_node192_hostname}.${_param:cluster_domain}
+        vcmp193:
+          address: ${_param:openstack_vcmp_node193_address}
+          names:
+          - ${_param:openstack_vcmp_node193_hostname}
+          - ${_param:openstack_vcmp_node193_hostname}.${_param:cluster_domain}
+        vcmp194:
+          address: ${_param:openstack_vcmp_node194_address}
+          names:
+          - ${_param:openstack_vcmp_node194_hostname}
+          - ${_param:openstack_vcmp_node194_hostname}.${_param:cluster_domain}
+        vcmp195:
+          address: ${_param:openstack_vcmp_node195_address}
+          names:
+          - ${_param:openstack_vcmp_node195_hostname}
+          - ${_param:openstack_vcmp_node195_hostname}.${_param:cluster_domain}
+        vcmp196:
+          address: ${_param:openstack_vcmp_node196_address}
+          names:
+          - ${_param:openstack_vcmp_node196_hostname}
+          - ${_param:openstack_vcmp_node196_hostname}.${_param:cluster_domain}
+        vcmp197:
+          address: ${_param:openstack_vcmp_node197_address}
+          names:
+          - ${_param:openstack_vcmp_node197_hostname}
+          - ${_param:openstack_vcmp_node197_hostname}.${_param:cluster_domain}
+        vcmp198:
+          address: ${_param:openstack_vcmp_node198_address}
+          names:
+          - ${_param:openstack_vcmp_node198_hostname}
+          - ${_param:openstack_vcmp_node198_hostname}.${_param:cluster_domain}
+        vcmp199:
+          address: ${_param:openstack_vcmp_node199_address}
+          names:
+          - ${_param:openstack_vcmp_node199_hostname}
+          - ${_param:openstack_vcmp_node199_hostname}.${_param:cluster_domain}
+        vcmp200:
+          address: ${_param:openstack_vcmp_node200_address}
+          names:
+          - ${_param:openstack_vcmp_node200_hostname}
+          - ${_param:openstack_vcmp_node200_hostname}.${_param:cluster_domain}
+        vcmp201:
+          address: ${_param:openstack_vcmp_node201_address}
+          names:
+          - ${_param:openstack_vcmp_node201_hostname}
+          - ${_param:openstack_vcmp_node201_hostname}.${_param:cluster_domain}
+        vcmp202:
+          address: ${_param:openstack_vcmp_node202_address}
+          names:
+          - ${_param:openstack_vcmp_node202_hostname}
+          - ${_param:openstack_vcmp_node202_hostname}.${_param:cluster_domain}
+        vcmp203:
+          address: ${_param:openstack_vcmp_node203_address}
+          names:
+          - ${_param:openstack_vcmp_node203_hostname}
+          - ${_param:openstack_vcmp_node203_hostname}.${_param:cluster_domain}
+        vcmp204:
+          address: ${_param:openstack_vcmp_node204_address}
+          names:
+          - ${_param:openstack_vcmp_node204_hostname}
+          - ${_param:openstack_vcmp_node204_hostname}.${_param:cluster_domain}
+        vcmp205:
+          address: ${_param:openstack_vcmp_node205_address}
+          names:
+          - ${_param:openstack_vcmp_node205_hostname}
+          - ${_param:openstack_vcmp_node205_hostname}.${_param:cluster_domain}
+        vcmp206:
+          address: ${_param:openstack_vcmp_node206_address}
+          names:
+          - ${_param:openstack_vcmp_node206_hostname}
+          - ${_param:openstack_vcmp_node206_hostname}.${_param:cluster_domain}
+        vcmp207:
+          address: ${_param:openstack_vcmp_node207_address}
+          names:
+          - ${_param:openstack_vcmp_node207_hostname}
+          - ${_param:openstack_vcmp_node207_hostname}.${_param:cluster_domain}
+        vcmp208:
+          address: ${_param:openstack_vcmp_node208_address}
+          names:
+          - ${_param:openstack_vcmp_node208_hostname}
+          - ${_param:openstack_vcmp_node208_hostname}.${_param:cluster_domain}
+        vcmp209:
+          address: ${_param:openstack_vcmp_node209_address}
+          names:
+          - ${_param:openstack_vcmp_node209_hostname}
+          - ${_param:openstack_vcmp_node209_hostname}.${_param:cluster_domain}
+        vcmp210:
+          address: ${_param:openstack_vcmp_node210_address}
+          names:
+          - ${_param:openstack_vcmp_node210_hostname}
+          - ${_param:openstack_vcmp_node210_hostname}.${_param:cluster_domain}
+        vcmp211:
+          address: ${_param:openstack_vcmp_node211_address}
+          names:
+          - ${_param:openstack_vcmp_node211_hostname}
+          - ${_param:openstack_vcmp_node211_hostname}.${_param:cluster_domain}
+        vcmp212:
+          address: ${_param:openstack_vcmp_node212_address}
+          names:
+          - ${_param:openstack_vcmp_node212_hostname}
+          - ${_param:openstack_vcmp_node212_hostname}.${_param:cluster_domain}
+        vcmp213:
+          address: ${_param:openstack_vcmp_node213_address}
+          names:
+          - ${_param:openstack_vcmp_node213_hostname}
+          - ${_param:openstack_vcmp_node213_hostname}.${_param:cluster_domain}
+        vcmp214:
+          address: ${_param:openstack_vcmp_node214_address}
+          names:
+          - ${_param:openstack_vcmp_node214_hostname}
+          - ${_param:openstack_vcmp_node214_hostname}.${_param:cluster_domain}
+        vcmp215:
+          address: ${_param:openstack_vcmp_node215_address}
+          names:
+          - ${_param:openstack_vcmp_node215_hostname}
+          - ${_param:openstack_vcmp_node215_hostname}.${_param:cluster_domain}
+        vcmp216:
+          address: ${_param:openstack_vcmp_node216_address}
+          names:
+          - ${_param:openstack_vcmp_node216_hostname}
+          - ${_param:openstack_vcmp_node216_hostname}.${_param:cluster_domain}
+        vcmp217:
+          address: ${_param:openstack_vcmp_node217_address}
+          names:
+          - ${_param:openstack_vcmp_node217_hostname}
+          - ${_param:openstack_vcmp_node217_hostname}.${_param:cluster_domain}
+        vcmp218:
+          address: ${_param:openstack_vcmp_node218_address}
+          names:
+          - ${_param:openstack_vcmp_node218_hostname}
+          - ${_param:openstack_vcmp_node218_hostname}.${_param:cluster_domain}
+        vcmp219:
+          address: ${_param:openstack_vcmp_node219_address}
+          names:
+          - ${_param:openstack_vcmp_node219_hostname}
+          - ${_param:openstack_vcmp_node219_hostname}.${_param:cluster_domain}
+        vcmp220:
+          address: ${_param:openstack_vcmp_node220_address}
+          names:
+          - ${_param:openstack_vcmp_node220_hostname}
+          - ${_param:openstack_vcmp_node220_hostname}.${_param:cluster_domain}
+        vcmp221:
+          address: ${_param:openstack_vcmp_node221_address}
+          names:
+          - ${_param:openstack_vcmp_node221_hostname}
+          - ${_param:openstack_vcmp_node221_hostname}.${_param:cluster_domain}
+        vcmp222:
+          address: ${_param:openstack_vcmp_node222_address}
+          names:
+          - ${_param:openstack_vcmp_node222_hostname}
+          - ${_param:openstack_vcmp_node222_hostname}.${_param:cluster_domain}
+        vcmp223:
+          address: ${_param:openstack_vcmp_node223_address}
+          names:
+          - ${_param:openstack_vcmp_node223_hostname}
+          - ${_param:openstack_vcmp_node223_hostname}.${_param:cluster_domain}
+        vcmp224:
+          address: ${_param:openstack_vcmp_node224_address}
+          names:
+          - ${_param:openstack_vcmp_node224_hostname}
+          - ${_param:openstack_vcmp_node224_hostname}.${_param:cluster_domain}
+        vcmp225:
+          address: ${_param:openstack_vcmp_node225_address}
+          names:
+          - ${_param:openstack_vcmp_node225_hostname}
+          - ${_param:openstack_vcmp_node225_hostname}.${_param:cluster_domain}
+        vcmp226:
+          address: ${_param:openstack_vcmp_node226_address}
+          names:
+          - ${_param:openstack_vcmp_node226_hostname}
+          - ${_param:openstack_vcmp_node226_hostname}.${_param:cluster_domain}
+        vcmp227:
+          address: ${_param:openstack_vcmp_node227_address}
+          names:
+          - ${_param:openstack_vcmp_node227_hostname}
+          - ${_param:openstack_vcmp_node227_hostname}.${_param:cluster_domain}
+        vcmp228:
+          address: ${_param:openstack_vcmp_node228_address}
+          names:
+          - ${_param:openstack_vcmp_node228_hostname}
+          - ${_param:openstack_vcmp_node228_hostname}.${_param:cluster_domain}
+        vcmp229:
+          address: ${_param:openstack_vcmp_node229_address}
+          names:
+          - ${_param:openstack_vcmp_node229_hostname}
+          - ${_param:openstack_vcmp_node229_hostname}.${_param:cluster_domain}
+        vcmp230:
+          address: ${_param:openstack_vcmp_node230_address}
+          names:
+          - ${_param:openstack_vcmp_node230_hostname}
+          - ${_param:openstack_vcmp_node230_hostname}.${_param:cluster_domain}
+        vcmp231:
+          address: ${_param:openstack_vcmp_node231_address}
+          names:
+          - ${_param:openstack_vcmp_node231_hostname}
+          - ${_param:openstack_vcmp_node231_hostname}.${_param:cluster_domain}
+        vcmp232:
+          address: ${_param:openstack_vcmp_node232_address}
+          names:
+          - ${_param:openstack_vcmp_node232_hostname}
+          - ${_param:openstack_vcmp_node232_hostname}.${_param:cluster_domain}
+        vcmp233:
+          address: ${_param:openstack_vcmp_node233_address}
+          names:
+          - ${_param:openstack_vcmp_node233_hostname}
+          - ${_param:openstack_vcmp_node233_hostname}.${_param:cluster_domain}
+        vcmp234:
+          address: ${_param:openstack_vcmp_node234_address}
+          names:
+          - ${_param:openstack_vcmp_node234_hostname}
+          - ${_param:openstack_vcmp_node234_hostname}.${_param:cluster_domain}
+        vcmp235:
+          address: ${_param:openstack_vcmp_node235_address}
+          names:
+          - ${_param:openstack_vcmp_node235_hostname}
+          - ${_param:openstack_vcmp_node235_hostname}.${_param:cluster_domain}
+        vcmp236:
+          address: ${_param:openstack_vcmp_node236_address}
+          names:
+          - ${_param:openstack_vcmp_node236_hostname}
+          - ${_param:openstack_vcmp_node236_hostname}.${_param:cluster_domain}
+        vcmp237:
+          address: ${_param:openstack_vcmp_node237_address}
+          names:
+          - ${_param:openstack_vcmp_node237_hostname}
+          - ${_param:openstack_vcmp_node237_hostname}.${_param:cluster_domain}
+        vcmp238:
+          address: ${_param:openstack_vcmp_node238_address}
+          names:
+          - ${_param:openstack_vcmp_node238_hostname}
+          - ${_param:openstack_vcmp_node238_hostname}.${_param:cluster_domain}
+        vcmp239:
+          address: ${_param:openstack_vcmp_node239_address}
+          names:
+          - ${_param:openstack_vcmp_node239_hostname}
+          - ${_param:openstack_vcmp_node239_hostname}.${_param:cluster_domain}
+        vcmp240:
+          address: ${_param:openstack_vcmp_node240_address}
+          names:
+          - ${_param:openstack_vcmp_node240_hostname}
+          - ${_param:openstack_vcmp_node240_hostname}.${_param:cluster_domain}
+        vcmp241:
+          address: ${_param:openstack_vcmp_node241_address}
+          names:
+          - ${_param:openstack_vcmp_node241_hostname}
+          - ${_param:openstack_vcmp_node241_hostname}.${_param:cluster_domain}
+        vcmp242:
+          address: ${_param:openstack_vcmp_node242_address}
+          names:
+          - ${_param:openstack_vcmp_node242_hostname}
+          - ${_param:openstack_vcmp_node242_hostname}.${_param:cluster_domain}
+        vcmp243:
+          address: ${_param:openstack_vcmp_node243_address}
+          names:
+          - ${_param:openstack_vcmp_node243_hostname}
+          - ${_param:openstack_vcmp_node243_hostname}.${_param:cluster_domain}
+        vcmp244:
+          address: ${_param:openstack_vcmp_node244_address}
+          names:
+          - ${_param:openstack_vcmp_node244_hostname}
+          - ${_param:openstack_vcmp_node244_hostname}.${_param:cluster_domain}
+        vcmp245:
+          address: ${_param:openstack_vcmp_node245_address}
+          names:
+          - ${_param:openstack_vcmp_node245_hostname}
+          - ${_param:openstack_vcmp_node245_hostname}.${_param:cluster_domain}
+        vcmp246:
+          address: ${_param:openstack_vcmp_node246_address}
+          names:
+          - ${_param:openstack_vcmp_node246_hostname}
+          - ${_param:openstack_vcmp_node246_hostname}.${_param:cluster_domain}
+        vcmp247:
+          address: ${_param:openstack_vcmp_node247_address}
+          names:
+          - ${_param:openstack_vcmp_node247_hostname}
+          - ${_param:openstack_vcmp_node247_hostname}.${_param:cluster_domain}
+        vcmp248:
+          address: ${_param:openstack_vcmp_node248_address}
+          names:
+          - ${_param:openstack_vcmp_node248_hostname}
+          - ${_param:openstack_vcmp_node248_hostname}.${_param:cluster_domain}
+        vcmp249:
+          address: ${_param:openstack_vcmp_node249_address}
+          names:
+          - ${_param:openstack_vcmp_node249_hostname}
+          - ${_param:openstack_vcmp_node249_hostname}.${_param:cluster_domain}
+        vcmp250:
+          address: ${_param:openstack_vcmp_node250_address}
+          names:
+          - ${_param:openstack_vcmp_node250_hostname}
+          - ${_param:openstack_vcmp_node250_hostname}.${_param:cluster_domain}
+        vcmp251:
+          address: ${_param:openstack_vcmp_node251_address}
+          names:
+          - ${_param:openstack_vcmp_node251_hostname}
+          - ${_param:openstack_vcmp_node251_hostname}.${_param:cluster_domain}
+        vcmp252:
+          address: ${_param:openstack_vcmp_node252_address}
+          names:
+          - ${_param:openstack_vcmp_node252_hostname}
+          - ${_param:openstack_vcmp_node252_hostname}.${_param:cluster_domain}
+        vcmp253:
+          address: ${_param:openstack_vcmp_node253_address}
+          names:
+          - ${_param:openstack_vcmp_node253_hostname}
+          - ${_param:openstack_vcmp_node253_hostname}.${_param:cluster_domain}
+        vcmp254:
+          address: ${_param:openstack_vcmp_node254_address}
+          names:
+          - ${_param:openstack_vcmp_node254_hostname}
+          - ${_param:openstack_vcmp_node254_hostname}.${_param:cluster_domain}
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
new file mode 100755
index 0000000..3e9f686
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
@@ -0,0 +1,1788 @@
+parameters:
+  _param:
+    openstack_database_backend_image: ${_param:salt_control_xenial_image_backend}
+    salt_control_cluster_node_cloud_init_openstack_database:
+      user_data:
+        write_files:
+        - content: |
+            ${salt:control:size:openstack.database:image_layout}
+          owner: root:root
+          path: /usr/share/growlvm/image-layout.yml
+  salt:
+    control:
+      size:
+        openstack.database:
+          cpu: 2
+          ram: 2048
+          disk_profile: small
+          net_profile: vcmp
+          image_layout: ${_param:salt_control_size_image_layout_openstack_database}
+      cluster:
+        internal:
+          domain: ${_param:cluster_domain}
+          engine: virt
+          node:
+            vcmp3:
+              name: ${_param:openstack_vcmp_node3_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp4:
+              name: ${_param:openstack_vcmp_node4_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp5:
+              name: ${_param:openstack_vcmp_node5_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp6:
+              name: ${_param:openstack_vcmp_node6_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp7:
+              name: ${_param:openstack_vcmp_node7_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp8:
+              name: ${_param:openstack_vcmp_node8_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp9:
+              name: ${_param:openstack_vcmp_node9_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp10:
+              name: ${_param:openstack_vcmp_node10_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp11:
+              name: ${_param:openstack_vcmp_node11_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp12:
+              name: ${_param:openstack_vcmp_node12_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp13:
+              name: ${_param:openstack_vcmp_node13_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp14:
+              name: ${_param:openstack_vcmp_node14_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp15:
+              name: ${_param:openstack_vcmp_node15_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp16:
+              name: ${_param:openstack_vcmp_node16_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp17:
+              name: ${_param:openstack_vcmp_node17_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp18:
+              name: ${_param:openstack_vcmp_node18_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp19:
+              name: ${_param:openstack_vcmp_node19_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp20:
+              name: ${_param:openstack_vcmp_node20_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp21:
+              name: ${_param:openstack_vcmp_node21_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp22:
+              name: ${_param:openstack_vcmp_node22_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp23:
+              name: ${_param:openstack_vcmp_node23_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp24:
+              name: ${_param:openstack_vcmp_node24_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp25:
+              name: ${_param:openstack_vcmp_node25_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp26:
+              name: ${_param:openstack_vcmp_node26_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp27:
+              name: ${_param:openstack_vcmp_node27_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp28:
+              name: ${_param:openstack_vcmp_node28_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp29:
+              name: ${_param:openstack_vcmp_node29_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp30:
+              name: ${_param:openstack_vcmp_node30_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp31:
+              name: ${_param:openstack_vcmp_node31_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp32:
+              name: ${_param:openstack_vcmp_node32_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp33:
+              name: ${_param:openstack_vcmp_node33_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp34:
+              name: ${_param:openstack_vcmp_node34_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp35:
+              name: ${_param:openstack_vcmp_node35_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp36:
+              name: ${_param:openstack_vcmp_node36_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp37:
+              name: ${_param:openstack_vcmp_node37_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp38:
+              name: ${_param:openstack_vcmp_node38_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp39:
+              name: ${_param:openstack_vcmp_node39_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp40:
+              name: ${_param:openstack_vcmp_node40_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp41:
+              name: ${_param:openstack_vcmp_node41_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp42:
+              name: ${_param:openstack_vcmp_node42_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp43:
+              name: ${_param:openstack_vcmp_node43_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp44:
+              name: ${_param:openstack_vcmp_node44_hostname}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp45:
+              name: ${_param:openstack_vcmp_node45_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp46:
+              name: ${_param:openstack_vcmp_node46_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp47:
+              name: ${_param:openstack_vcmp_node47_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp48:
+              name: ${_param:openstack_vcmp_node48_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp49:
+              name: ${_param:openstack_vcmp_node49_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp50:
+              name: ${_param:openstack_vcmp_node50_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp51:
+              name: ${_param:openstack_vcmp_node51_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp52:
+              name: ${_param:openstack_vcmp_node52_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp53:
+              name: ${_param:openstack_vcmp_node53_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp54:
+              name: ${_param:openstack_vcmp_node54_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp55:
+              name: ${_param:openstack_vcmp_node55_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp56:
+              name: ${_param:openstack_vcmp_node56_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp57:
+              name: ${_param:openstack_vcmp_node57_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp58:
+              name: ${_param:openstack_vcmp_node58_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp59:
+              name: ${_param:openstack_vcmp_node59_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp60:
+              name: ${_param:openstack_vcmp_node60_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp61:
+              name: ${_param:openstack_vcmp_node61_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp62:
+              name: ${_param:openstack_vcmp_node62_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp63:
+              name: ${_param:openstack_vcmp_node63_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp64:
+              name: ${_param:openstack_vcmp_node64_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp65:
+              name: ${_param:openstack_vcmp_node65_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp66:
+              name: ${_param:openstack_vcmp_node66_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp67:
+              name: ${_param:openstack_vcmp_node67_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp68:
+              name: ${_param:openstack_vcmp_node68_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp69:
+              name: ${_param:openstack_vcmp_node69_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp70:
+              name: ${_param:openstack_vcmp_node70_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp71:
+              name: ${_param:openstack_vcmp_node71_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp72:
+              name: ${_param:openstack_vcmp_node72_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp73:
+              name: ${_param:openstack_vcmp_node73_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp74:
+              name: ${_param:openstack_vcmp_node74_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp75:
+              name: ${_param:openstack_vcmp_node75_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp76:
+              name: ${_param:openstack_vcmp_node76_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp77:
+              name: ${_param:openstack_vcmp_node77_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp78:
+              name: ${_param:openstack_vcmp_node78_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp79:
+              name: ${_param:openstack_vcmp_node79_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp80:
+              name: ${_param:openstack_vcmp_node80_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp81:
+              name: ${_param:openstack_vcmp_node81_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp82:
+              name: ${_param:openstack_vcmp_node82_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp83:
+              name: ${_param:openstack_vcmp_node83_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp84:
+              name: ${_param:openstack_vcmp_node84_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp85:
+              name: ${_param:openstack_vcmp_node85_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp86:
+              name: ${_param:openstack_vcmp_node86_hostname}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp87:
+              name: ${_param:openstack_vcmp_node87_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp88:
+              name: ${_param:openstack_vcmp_node88_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp89:
+              name: ${_param:openstack_vcmp_node89_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp90:
+              name: ${_param:openstack_vcmp_node90_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp91:
+              name: ${_param:openstack_vcmp_node91_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp92:
+              name: ${_param:openstack_vcmp_node92_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp93:
+              name: ${_param:openstack_vcmp_node93_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp94:
+              name: ${_param:openstack_vcmp_node94_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp95:
+              name: ${_param:openstack_vcmp_node95_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp96:
+              name: ${_param:openstack_vcmp_node96_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp97:
+              name: ${_param:openstack_vcmp_node97_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp98:
+              name: ${_param:openstack_vcmp_node98_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp99:
+              name: ${_param:openstack_vcmp_node99_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp100:
+              name: ${_param:openstack_vcmp_node100_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp101:
+              name: ${_param:openstack_vcmp_node101_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp102:
+              name: ${_param:openstack_vcmp_node102_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp103:
+              name: ${_param:openstack_vcmp_node103_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp104:
+              name: ${_param:openstack_vcmp_node104_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp105:
+              name: ${_param:openstack_vcmp_node105_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp106:
+              name: ${_param:openstack_vcmp_node106_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp107:
+              name: ${_param:openstack_vcmp_node107_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp108:
+              name: ${_param:openstack_vcmp_node108_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp109:
+              name: ${_param:openstack_vcmp_node109_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp110:
+              name: ${_param:openstack_vcmp_node110_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp111:
+              name: ${_param:openstack_vcmp_node111_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp112:
+              name: ${_param:openstack_vcmp_node112_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp113:
+              name: ${_param:openstack_vcmp_node113_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp114:
+              name: ${_param:openstack_vcmp_node114_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp115:
+              name: ${_param:openstack_vcmp_node115_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp116:
+              name: ${_param:openstack_vcmp_node116_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp117:
+              name: ${_param:openstack_vcmp_node117_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp118:
+              name: ${_param:openstack_vcmp_node118_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp119:
+              name: ${_param:openstack_vcmp_node119_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp120:
+              name: ${_param:openstack_vcmp_node120_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp121:
+              name: ${_param:openstack_vcmp_node121_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp122:
+              name: ${_param:openstack_vcmp_node122_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp123:
+              name: ${_param:openstack_vcmp_node123_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp124:
+              name: ${_param:openstack_vcmp_node124_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp125:
+              name: ${_param:openstack_vcmp_node125_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp126:
+              name: ${_param:openstack_vcmp_node126_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp127:
+              name: ${_param:openstack_vcmp_node127_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp128:
+              name: ${_param:openstack_vcmp_node128_hostname}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp129:
+              name: ${_param:openstack_vcmp_node129_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp130:
+              name: ${_param:openstack_vcmp_node130_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp131:
+              name: ${_param:openstack_vcmp_node131_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp132:
+              name: ${_param:openstack_vcmp_node132_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp133:
+              name: ${_param:openstack_vcmp_node133_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp134:
+              name: ${_param:openstack_vcmp_node134_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp135:
+              name: ${_param:openstack_vcmp_node135_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp136:
+              name: ${_param:openstack_vcmp_node136_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp137:
+              name: ${_param:openstack_vcmp_node137_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp138:
+              name: ${_param:openstack_vcmp_node138_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp139:
+              name: ${_param:openstack_vcmp_node139_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp140:
+              name: ${_param:openstack_vcmp_node140_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp141:
+              name: ${_param:openstack_vcmp_node141_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp142:
+              name: ${_param:openstack_vcmp_node142_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp143:
+              name: ${_param:openstack_vcmp_node143_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp144:
+              name: ${_param:openstack_vcmp_node144_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp145:
+              name: ${_param:openstack_vcmp_node145_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp146:
+              name: ${_param:openstack_vcmp_node146_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp147:
+              name: ${_param:openstack_vcmp_node147_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp148:
+              name: ${_param:openstack_vcmp_node148_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp149:
+              name: ${_param:openstack_vcmp_node149_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp150:
+              name: ${_param:openstack_vcmp_node150_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp151:
+              name: ${_param:openstack_vcmp_node151_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp152:
+              name: ${_param:openstack_vcmp_node152_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp153:
+              name: ${_param:openstack_vcmp_node153_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp154:
+              name: ${_param:openstack_vcmp_node154_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp155:
+              name: ${_param:openstack_vcmp_node155_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp156:
+              name: ${_param:openstack_vcmp_node156_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp157:
+              name: ${_param:openstack_vcmp_node157_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp158:
+              name: ${_param:openstack_vcmp_node158_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp159:
+              name: ${_param:openstack_vcmp_node159_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp160:
+              name: ${_param:openstack_vcmp_node160_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp161:
+              name: ${_param:openstack_vcmp_node161_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp162:
+              name: ${_param:openstack_vcmp_node162_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp163:
+              name: ${_param:openstack_vcmp_node163_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp164:
+              name: ${_param:openstack_vcmp_node164_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp165:
+              name: ${_param:openstack_vcmp_node165_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp166:
+              name: ${_param:openstack_vcmp_node166_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp167:
+              name: ${_param:openstack_vcmp_node167_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp168:
+              name: ${_param:openstack_vcmp_node168_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp169:
+              name: ${_param:openstack_vcmp_node169_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp170:
+              name: ${_param:openstack_vcmp_node170_hostname}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp171:
+              name: ${_param:openstack_vcmp_node171_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp172:
+              name: ${_param:openstack_vcmp_node172_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp173:
+              name: ${_param:openstack_vcmp_node173_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp174:
+              name: ${_param:openstack_vcmp_node174_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp175:
+              name: ${_param:openstack_vcmp_node175_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp176:
+              name: ${_param:openstack_vcmp_node176_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp177:
+              name: ${_param:openstack_vcmp_node177_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp178:
+              name: ${_param:openstack_vcmp_node178_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp179:
+              name: ${_param:openstack_vcmp_node179_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp180:
+              name: ${_param:openstack_vcmp_node180_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp181:
+              name: ${_param:openstack_vcmp_node181_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp182:
+              name: ${_param:openstack_vcmp_node182_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp183:
+              name: ${_param:openstack_vcmp_node183_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp184:
+              name: ${_param:openstack_vcmp_node184_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp185:
+              name: ${_param:openstack_vcmp_node185_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp186:
+              name: ${_param:openstack_vcmp_node186_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp187:
+              name: ${_param:openstack_vcmp_node187_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp188:
+              name: ${_param:openstack_vcmp_node188_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp189:
+              name: ${_param:openstack_vcmp_node189_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp190:
+              name: ${_param:openstack_vcmp_node190_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp191:
+              name: ${_param:openstack_vcmp_node191_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp192:
+              name: ${_param:openstack_vcmp_node192_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp193:
+              name: ${_param:openstack_vcmp_node193_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp194:
+              name: ${_param:openstack_vcmp_node194_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp195:
+              name: ${_param:openstack_vcmp_node195_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp196:
+              name: ${_param:openstack_vcmp_node196_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp197:
+              name: ${_param:openstack_vcmp_node197_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp198:
+              name: ${_param:openstack_vcmp_node198_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp199:
+              name: ${_param:openstack_vcmp_node199_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp200:
+              name: ${_param:openstack_vcmp_node200_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp201:
+              name: ${_param:openstack_vcmp_node201_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp202:
+              name: ${_param:openstack_vcmp_node202_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp203:
+              name: ${_param:openstack_vcmp_node203_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp204:
+              name: ${_param:openstack_vcmp_node204_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp205:
+              name: ${_param:openstack_vcmp_node205_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp206:
+              name: ${_param:openstack_vcmp_node206_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp207:
+              name: ${_param:openstack_vcmp_node207_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp208:
+              name: ${_param:openstack_vcmp_node208_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp209:
+              name: ${_param:openstack_vcmp_node209_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp210:
+              name: ${_param:openstack_vcmp_node210_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp211:
+              name: ${_param:openstack_vcmp_node211_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp212:
+              name: ${_param:openstack_vcmp_node212_hostname}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp213:
+              name: ${_param:openstack_vcmp_node213_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp214:
+              name: ${_param:openstack_vcmp_node214_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp215:
+              name: ${_param:openstack_vcmp_node215_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp216:
+              name: ${_param:openstack_vcmp_node216_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp217:
+              name: ${_param:openstack_vcmp_node217_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp218:
+              name: ${_param:openstack_vcmp_node218_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp219:
+              name: ${_param:openstack_vcmp_node219_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp220:
+              name: ${_param:openstack_vcmp_node220_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp221:
+              name: ${_param:openstack_vcmp_node221_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp222:
+              name: ${_param:openstack_vcmp_node222_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp223:
+              name: ${_param:openstack_vcmp_node223_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp224:
+              name: ${_param:openstack_vcmp_node224_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp225:
+              name: ${_param:openstack_vcmp_node225_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp226:
+              name: ${_param:openstack_vcmp_node226_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp227:
+              name: ${_param:openstack_vcmp_node227_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp228:
+              name: ${_param:openstack_vcmp_node228_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp229:
+              name: ${_param:openstack_vcmp_node229_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp230:
+              name: ${_param:openstack_vcmp_node230_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp231:
+              name: ${_param:openstack_vcmp_node231_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp232:
+              name: ${_param:openstack_vcmp_node232_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp233:
+              name: ${_param:openstack_vcmp_node233_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp234:
+              name: ${_param:openstack_vcmp_node234_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp235:
+              name: ${_param:openstack_vcmp_node235_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp236:
+              name: ${_param:openstack_vcmp_node236_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp237:
+              name: ${_param:openstack_vcmp_node237_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp238:
+              name: ${_param:openstack_vcmp_node238_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp239:
+              name: ${_param:openstack_vcmp_node239_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp240:
+              name: ${_param:openstack_vcmp_node240_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp241:
+              name: ${_param:openstack_vcmp_node241_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp242:
+              name: ${_param:openstack_vcmp_node242_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp243:
+              name: ${_param:openstack_vcmp_node243_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp244:
+              name: ${_param:openstack_vcmp_node244_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp245:
+              name: ${_param:openstack_vcmp_node245_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp246:
+              name: ${_param:openstack_vcmp_node246_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp247:
+              name: ${_param:openstack_vcmp_node247_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp248:
+              name: ${_param:openstack_vcmp_node248_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp249:
+              name: ${_param:openstack_vcmp_node249_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp250:
+              name: ${_param:openstack_vcmp_node250_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp251:
+              name: ${_param:openstack_vcmp_node251_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp252:
+              name: ${_param:openstack_vcmp_node252_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp253:
+              name: ${_param:openstack_vcmp_node253_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
+            vcmp254:
+              name: ${_param:openstack_vcmp_node254_hostname}
+              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_xenial_image}
+              backend: ${_param:openstack_database_backend_image}
+              size: openstack.database
+              cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmp.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmp.yml
new file mode 100755
index 0000000..1757424
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmp.yml
@@ -0,0 +1,55 @@
+classes:
+- system.nova.compute.cluster
+- system.nova.compute.notification.messagingv2
+- system.ceilometer.agent.telemetry.cluster
+- system.ceilometer.agent.polling.default
+- system.nova.compute.libvirt.ssl
+- system.nova.compute.libvirt.ssl.vnc
+- system.prometheus.exporters.libvirt
+- system.neutron.compute.cluster
+- system.nova.compute.storage.ceph
+- system.ceph.common.cluster
+- cluster.bm-b300-cicd-queens-ovs-maas.ceph.common
+- cluster.bm-b300-cicd-queens-ovs-maas.ceph.keyrings.cinder
+- cluster.bm-b300-cicd-queens-ovs-maas.ceph.keyrings.nova
+- system.linux.network.dynamic_hosts
+- cluster.bm-b300-cicd-queens-ovs-maas.infra
+- cluster.bm-b300-cicd-queens-ovs-maas.openstack.networking.vcmpcompute
+parameters:
+  _param:
+    cluster_vip_address: ${_param:openstack_control_address}
+    cluster_local_address: ${_param:single_address}
+    cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+    cluster_node01_address: ${_param:openstack_control_node01_address}
+    cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+    cluster_node02_address: ${_param:openstack_control_node02_address}
+    cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+    cluster_node03_address: ${_param:openstack_control_node03_address}
+    nova_vncproxy_url: https://${_param:cluster_public_host}:6080
+    galera_ssl_enabled: true
+    openstack_mysql_x509_enabled: True
+    rabbitmq_ssl_enabled: True
+    openstack_rabbitmq_port: 5671
+    openstack_rabbitmq_x509_enabled: True
+    openstack_rabbitmq_port: 5671
+    primary_first_nic: eth1
+    primary_second_nic: eth2
+    ceilometer_agent_ssl_enabled: True
+    cluster_internal_protocol: https
+  nova:
+    compute:
+      reserved_host_memory_mb: 1100
+      workaround:
+        disable_libvirt_livesnapshot: True
+# Set rp_filter to Loose mode to allow requests from VM`s floating address to exported Manila share in tenant network
+# For Ironic deployments it allows Ironic provisioned nodes to reach iscsi target in boot from volume cases
+  linux:
+    system:
+      kernel:
+        sysctl:
+          net.ipv4.conf.all.rp_filter: 2
+## Best practice configure high speed interface for live migrations
+#  nova:
+#    libvirt:
+#      migration_inbound_addr: ${_param:single_address}
+
diff --git a/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmpcompute.yml b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmpcompute.yml
new file mode 100755
index 0000000..34d58c7
--- /dev/null
+++ b/tcp_tests/templates/bm-b300-cicd-queens-ovs-maas/vcmpcompute.yml
@@ -0,0 +1,64 @@
+parameters:
+  _param:
+    management_interface: ens2
+    primary_interface: ens3
+    deploy_interface: ens4
+    tenant_interface: ens5
+    external_interface: ens6
+  linux:
+    network:
+      bridge: openvswitch
+      interface:
+        management_int:
+          enabled: true
+          name: ${_param:management_interface}
+          proto: dhcp
+          type: eth
+        deploy_int:
+          enabled: true
+          name: ${_param:deploy_interface}
+          proto: dhcp
+          type: eth
+        primary_int:
+          enabled: true
+          name: ${_param:primary_interface}
+          proto: manual
+          type: eth
+          ipflush_onchange: true
+          restart_on_ipflush: true
+        tenant_int:
+          enabled: true
+          name: ${_param:tenant_interface}
+          proto: manual
+          type: eth
+          ipflush_onchange: true
+          restart_on_ipflush: true
+        external_int:
+          enabled: true
+          name: ${_param:external_interface}
+          proto: manual
+          ovs_port_type: OVSPort
+          ovs_bridge: br-floating
+          type: ovs_port
+          bridge: br-floating
+          ipflush_onchange: true
+          restart_on_ipflush: true
+        br-ctl:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:single_address}
+          netmask: ${_param:control_network_netmask}
+          use_interfaces:
+          - ${_param:primary_interface}
+        br-mesh:
+          enabled: true
+          type: bridge
+          proto: static
+          address: ${_param:tenant_address}
+          netmask: ${_param:tenant_network_netmask}
+          use_interfaces:
+          - ${_param:tenant_interface}
+        br-floating:
+          enabled: true
+          type: ovs_bridge
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
index f5a46f8..3e9f686 100644
--- a/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
+++ b/tcp_tests/templates/released-bm-b300-cicd-queens-ovs-maas/openstack_vcompute_cluster.yml
@@ -297,21 +297,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp42:
               name: ${_param:openstack_vcmp_node42_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp43:
               name: ${_param:openstack_vcmp_node43_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp44:
               name: ${_param:openstack_vcmp_node44_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -591,21 +591,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp84:
               name: ${_param:openstack_vcmp_node84_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp85:
               name: ${_param:openstack_vcmp_node85_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp86:
               name: ${_param:openstack_vcmp_node86_hostname}
-              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -885,21 +885,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp126:
               name: ${_param:openstack_vcmp_node126_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp127:
               name: ${_param:openstack_vcmp_node127_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp128:
               name: ${_param:openstack_vcmp_node128_hostname}
-              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -1179,21 +1179,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp168:
               name: ${_param:openstack_vcmp_node168_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp169:
               name: ${_param:openstack_vcmp_node169_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp170:
               name: ${_param:openstack_vcmp_node170_hostname}
-              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node04_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
@@ -1473,21 +1473,21 @@
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp210:
               name: ${_param:openstack_vcmp_node210_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp211:
               name: ${_param:openstack_vcmp_node211_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
               cloud_init: ${_param:salt_control_cluster_node_cloud_init_openstack_database}
             vcmp212:
               name: ${_param:openstack_vcmp_node212_hostname}
-              provider: ${_param:infra_kvm_node06_hostname}.${_param:cluster_domain}
+              provider: ${_param:infra_kvm_node05_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               backend: ${_param:openstack_database_backend_image}
               size: openstack.database
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
index d998d47..a0ddfdd 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/underlay-userdata.yaml
@@ -57,11 +57,11 @@
    - path: /usr/share/growlvm/image-layout.yml
      content: |
        root:
-         size: '65%VG'
+         size: '45%VG'
        home:
          size: '1%VG'
        var_log:
-         size: '10%VG'
+         size: '30%VG'
        var_log_audit:
          size: '5%VG'
        var_tmp:
diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index c7c919c..44cf396 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -120,10 +120,10 @@
         dt = drivetrain_actions
         jenkins_start_timeout = 60
         jenkins_build_timeout = 6 * 60 * 60
-        cluster_name = settings.ENV_NAME
+        config_name = settings.LAB_CONFIG_NAME
         tempest_pattern = settings.TEMPEST_PATTERN
         skiplist_file = "tcp_tests/templates/{}/tempest_skip.list".\
-            format(cluster_name)
+            format(config_name)
 
         show_step(1)
         salt.sync_time()
diff --git a/tcp_tests/tests/system/test_deploy_250_computes.py b/tcp_tests/tests/system/test_deploy_250_computes.py
index 1b2fa2a..8c4f386 100644
--- a/tcp_tests/tests/system/test_deploy_250_computes.py
+++ b/tcp_tests/tests/system/test_deploy_250_computes.py
@@ -13,110 +13,241 @@
 #    under the License.
 
 import pytest
+import os
+import json
 
+from threading import Thread
 from tcp_tests import logger
 from tcp_tests import settings
 
-
 LOG = logger.logger
 
 
 @pytest.mark.deploy
-class TestkDeploy250Computes(object):
+class TestDeploy250Computes(object):
     "https://mirantis.jira.com/browse/PROD-36488 Deploy 250vcpu for BM"
 
     @pytest.mark.grab_versions
     @pytest.mark.parametrize("_", [settings.ENV_NAME])
     @pytest.mark.run_mcp_update
     def test_deploy_250_computes(self, reclass_actions, underlay_actions,
-                                 show_step, salt_actions, _):
+                                 show_step, config,
+                                 salt_actions, _):
+        """Execute Deploy 250 Computes
+
+        Scenario:
+            1. Upload patched parts of model
+            2. Generate nodes configs and apply changes to kvm nodes
+            3. One by one apply network changes
+            4. Check that bridges are available on all nodes
+            5. One by one for each kvm create vcmp VMs
+            6. Check VMs
+            7. Deploy vcmp nodes
+            8. Discover new computes
+        """
         reclass = reclass_actions
         ssh = underlay_actions
-        master_host = "cfg01"
+        salt = salt_actions
+
+        cfg_node = [node['node_name'] for node in config.underlay.ssh
+                    if 'salt_master' in node.get('roles')][0]
 
         # ################# Upload patched parts of model  ####################
         show_step(1)
-
-        lab_name = settings.LAB_CONFIG_NAME
-
-        reclass.merge_context("/root/environment/env_add.yml".format(lab_name),
-                              "cluster/*/init.yml")
-        reclass.merge_context("/root/environment/infra_config_nodes_add.yml"
-                              .format(lab_name),
-                              "cluster/*/infra/config/nodes.yml")
-        reclass.merge_context("/root/environment/infra_kvm_add.yml"
-                              .format(lab_name),
-                              "cluster/*/infra/kvm.yml")
-        reclass.merge_context("/root/environment/openstack_init_add.yml"
-                              .format(lab_name),
-                              "cluster/*/openstack/init.yml")
+        source_path = os.path.join("{}/tcp_tests/templates/{}/".format(
+            settings.LOGS_DIR, settings.ENV_NAME))
+        with open(source_path + "vcmp.yml") as f:
+            reclass.create_yaml_with_context(
+                f.read(),
+                "cluster/{}/openstack/compute/vcmp.yml".format(
+                    settings.ENV_NAME))
+        with open(source_path + "vcmpcompute.yml") as f:
+            reclass.create_yaml_with_context(
+                f.read(),
+                "cluster/{}/openstack/networking/vcmpcompute.yml".format(
+                    settings.ENV_NAME))
+        with open(source_path + "openstack_vcompute_cluster.yml") as f:
+            reclass.create_yaml_with_context(
+                f.read(),
+                "cluster/{}/infra/openstack_vcompute_cluster.yml".format(
+                    settings.ENV_NAME))
+        with open(source_path + "env_add.yml") as f:
+            reclass.merge_context(f.read(), "environment/*/init.yml")
+        with open(source_path + "infra_config_nodes_add.yml") as f:
+            reclass.merge_context(f.read(), "cluster/*/infra/config/nodes.yml")
+        with open(source_path + "infra_kvm_add.yml") as f:
+            reclass.merge_context(f.read(), "cluster/*/infra/kvm.yml")
+        with open(source_path + "openstack_init_add.yml") as f:
+            reclass.merge_context(f.read(), "cluster/*/openstack/init.yml")
+        cmp_nova_init_wa = "parameters:\n" \
+                           "  _param:\n" \
+                           "    nova_compute_libvirt_allowed_dn_list:\n" \
+                           "      all:\n"\
+                           "        value: '*CN=*cmp*'"
+        reclass.merge_context(
+            cmp_nova_init_wa,
+            "system/nova/compute/libvirt/ssl/init.yml")
 
         # ###### Generate nodes configs and apply changes to kvm nodes ########
         show_step(2)
 
-        ssh.check_call(
-            "salt-call state.apply reclass.storage",
-            node_name=master_host
-        )
-        salt_actions.run_state("kvm*", "saltutil.sync_all")
-        salt_actions.run_state("kvm*", "saltutil.refresh_pillar")
+        state_output = ssh.check_call("salt-call state.apply reclass.storage "
+                                      "--out=json",
+                                      node_name=cfg_node,
+                                      verbose=True
+                                      )
+        need_output = json.loads(state_output['stdout_str'])
+        LOG.info(need_output)
+        ret = salt.run_state("kvm*", "saltutil.sync_all")
+        LOG.info(ret)
+        ret = salt.run_state("kvm*", "saltutil.refresh_pillar")
+        LOG.info(ret)
 
         # ################# One by one apply network changes ##################
         show_step(3)
 
         kvm_nodes = ssh.check_call(
             "salt 'cfg01*' pillar.get linux:network:host | grep '  kvm' "
-            "| sed 's/   *//g' | sed 's/://g'",
-            master_host
-        )
-        for node in kvm_nodes.split('\n'):
-            salt_actions.run_state(node, "state.apply", "linux.network")
+            "| sed 's/   *//g' | sed 's/:/*/g'",
+            node_name=cfg_node
+        )['stdout_str'].splitlines()
+        for node in kvm_nodes:
+            ret = salt.run_state(node, "state.apply", "linux.network")
+            LOG.info(ret)
 
         # ########## Check that bridges are available on all nodes ############
         show_step(4)
 
-        salt_actions.cmd_run("kvm*", "brctl show | grep 'ctl'")
-        salt_actions.cmd_run("kvm*", "brctl show | grep 'mesh'")
+        ret = salt.run_state("kvm*", "cmd.run", "brctl show | grep 'ctl'")
+        LOG.info(ret)
+        ret = salt.run_state("kvm*", "cmd.run", "brctl show | grep 'mesh'")
+        LOG.info(ret)
 
         # ########### One by one for each kvm create vcmp VMs #################
         show_step(5)
 
-        for node in kvm_nodes.split('\n'):
-            salt_actions.run_state(node, "state.apply", "salt.control")
+        for node in kvm_nodes:
+            ret = salt.run_state(node, "state.apply", "salt.control")
+            LOG.info(ret)
 
         # ########################### Check VMs ###############################
         show_step(6)
 
-        salt_actions.cmd_run("kvm01*", "virsh list")
+        ret = salt.cmd_run("kvm01*", "virsh list")
+        LOG.info(ret)
         ssh.check_call(
             "salt-key",
-            node_name=master_host
+            node_name=cfg_node,
+            verbose=True
         )
 
         ssh.check_call(
             "salt-call mine.get '*' x509.get_pem_entries",
-            node_name=master_host
+            node_name=cfg_node,
+            verbose=True
         )
 
-        salt_actions.run_state(node, "state.apply", "salt.minion")
+        ret = salt.run_state(cfg_node, "state.apply salt.minion")
+        LOG.info(ret)
 
         # ######################## Deploy vcmp nodes ##########################
         show_step(7)
 
-        for vcmp in range(3, 255):
-            cmd = "salt 'vcmp${i}.*' saltutil.sync_all; " \
-                  "salt 'vcmp${i}.*' saltutil.sync_grains; " \
-                  "salt 'vcmp${i}.*' saltutil.refresh_pillar; " \
-                  "sleep 5; " \
-                  "salt 'vcmp${i}.*' state.sls linux,ntp,openssh,salt;" \
-                  "sleep 5; " \
-                  "salt 'vcmp${i}.*' state.highstate"
-            ssh.check_call(
-                cmd,
-                node_name=master_host
-            )
+        deploy_thread = 8
+        vcmp_num_start = 3
+        vcmp_num_end = 254
+
+        threads = list()
+        for n in range(vcmp_num_start, vcmp_num_end, deploy_thread + 1):
+            for i in range(n, n + deploy_thread):
+                th = Thread(target=deploy_vcmp_node, args=(
+                    i, salt_actions, underlay_actions, ))
+                threads.append(th)
+                th.start()
+            for index, thread in enumerate(threads):
+                thread.join()
 
         # ####################### Discover new computes #######################
         show_step(8)
 
-        salt_actions.run_state(node, "state.sls", "nova.controller")
+        command = [
+            {
+                'description': "Run nova.controller for ctl01",
+                'node_name': ssh.get_target_node_names('cfg01')[0],
+                'cmd': (
+                    "set -ex; "
+                    "salt 'ctl01.*' state.sls nova.controller"),
+                'retry': {
+                    'count': 1,
+                    'delay': 5}}
+        ]
+        salt.execute_commands(command,
+                              label='New computes discover')
+
+
+def deploy_vcmp_node(vcmp_num, salt_actions, underlay_actions, ):
+
+    salt = salt_actions
+    ssh = underlay_actions
+
+    str_vcmp = str(vcmp_num)
+    print("execute vcmp{}".format(
+        str_vcmp))
+    node_name = ssh.get_target_node_names('cfg01')[0]
+    commands = [
+        {
+            'description': ("Sync grains and refresh pillars"
+                            "for vcmp{}".format(str_vcmp)),
+            'node_name': node_name,
+            'cmd': (
+                "set -ex; "
+                "salt 'vcmp{num}.*' saltutil.sync_all; "
+                "salt 'vcmp{num}.*' saltutil.sync_grains; "
+                "salt 'vcmp{num}.*' saltutil.refresh_pillar".format(
+                    num=str_vcmp)),
+            'retry': {
+                'count': 1,
+                'delay': 5}},
+        {
+            'description': "PRE_install packages for vcmp" +
+                           str_vcmp,
+            'node_name': node_name,
+            'cmd': (
+                "set -ex; "
+                "salt 'vcmp{}.*' state.sls "
+                "-l quiet --state-verbose=false "
+                "linux.system.repo,linux.network,rsyslog".format(
+                    str_vcmp)),
+            'retry': {
+                'count': 3,
+                'delay': 5}},
+        {
+            'description': "Install packages for vcmp" +
+                           str_vcmp,
+            'node_name': node_name,
+            'cmd': (
+                "set -ex; "
+                "salt 'vcmp{}.*' state.sls "
+                "-l quiet --state-verbose=false "
+                "linux,ntp,openssh,salt,nova".format(
+                    str_vcmp)),
+            'retry': {
+                'count': 3,
+                'delay': 5}},
+        {
+            'description': "Run state.highstate for vcmp" +
+                           str_vcmp,
+            'node_name': node_name,
+            'cmd': (
+                "set -ex; "
+                "salt 'vcmp{}.*' "
+                "-l quiet --state-verbose=false "
+                "state.highstate".format(
+                    str_vcmp)),
+            'retry': {
+                'count': 3,
+                'delay': 5}}
+    ]
+    salt.execute_commands(commands,
+                          label='Deploy vCMP{} node'
+                          .format(vcmp_num))
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 6c1c257..15a0586 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -180,6 +180,37 @@
         LOG.info("Skipping WA for Alerta API key")
 
 
+@pytest.fixture
+def wa_redis_server_version_3_prod36960(reclass_actions, salt_actions):
+    version_pillar = "redis:server:version"
+    tgt = "I@{}".format(version_pillar)
+    pillar_file = "cluster/*/openstack/telemetry.yml"
+    redis_target_version = "5.0"
+
+    msg_nodes = salt_actions.get_minions_by_target(tgt)
+    if not msg_nodes:
+        LOG.info("dbs* nodes not found, skipping")
+        return
+    else:
+        msg_node = msg_nodes[0]
+
+    if str(salt_actions.get_single_pillar(
+            msg_node,
+            version_pillar)) == redis_target_version:
+        LOG.info("Redis-server is already '{}', skipping".format(
+            redis_target_version))
+        return
+
+    LOG.info("Setting redis-server version to '{}'".format(
+        redis_target_version))
+    reclass_actions.add_key(
+        "parameters.{}".format(version_pillar.replace(":", ".")),
+        redis_target_version,
+        pillar_file)
+    salt_actions.run_state(" or ".join(msg_nodes),
+                           "saltutil.refresh_pillar")
+
+
 @pytest.fixture(scope='class')
 def enable_openstack_update(reclass_actions, salt_actions):
     param = "parameters._param.openstack_upgrade_enabled"
@@ -197,7 +228,8 @@
 @pytest.mark.usefixtures("switch_to_proposed_pipelines",
                          "update_to_tag",
                          "wa_for_galera_clustercheck_password_prod35705",
-                         "wa_for_alerta_password_prod35958")
+                         "wa_for_alerta_password_prod35958",
+                         "wa_redis_server_version_3_prod36960")
 class TestUpdateMcpCluster(object):
     """
     Following the steps in