diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
index 4a0dafa..7d4f5f2 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/init.yml
@@ -166,6 +166,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 9690b49..537cafb 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -157,6 +157,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index 9aa45ce..cd42a02 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -152,6 +152,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
index b7e9786..4732fd1 100644
--- a/classes/cluster/virtual-mcp05-dvr/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -13,30 +13,24 @@
     cluster_domain: virtual-mcp05-dvr.local
     cluster_name: virtual-mcp05-dvr
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_database_address: 172.16.10.254
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
-    openstack_gateway_hostname: gtw
-    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node01_address: 172.16.10.94
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
+    openstack_gateway_address: 172.16.10.110
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/init.yml b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
index 73108aa..28a045d 100644
--- a/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/init.yml
@@ -118,4 +118,14 @@
           address: ${_param:openstack_gateway_node01_address}
           names:
           - gtw01
-          - gtw01.${_param:cluster_domain}
\ No newline at end of file
+          - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp05-ovs/init.yml b/classes/cluster/virtual-mcp05-ovs/init.yml
index 0db990b..27f0242 100644
--- a/classes/cluster/virtual-mcp05-ovs/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/init.yml
@@ -13,34 +13,26 @@
     cluster_domain: virtual-mcp05-ovs.local
     cluster_name: virtual-mcp05-ovs
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
-    openstack_gateway_hostname: gtw
-    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node01_address: 172.16.10.94
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
+    openstack_gateway_address: 172.16.10.110
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
+
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/init.yml b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
index 442516f..a557f04 100644
--- a/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/init.yml
@@ -119,4 +119,13 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
-
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
index 6fab7f0..da3e7b1 100755
--- a/classes/cluster/virtual-mcp10-contrail/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -14,21 +14,22 @@
     cluster_name: virtual-mcp10-contrail
 
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
+
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node02_address}
+
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
@@ -50,7 +51,7 @@
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
 
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
index e7462cb..d00d8e7 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/init.yml
@@ -143,3 +143,13 @@
           names:
           - dbs03
           - dbs03.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-dvr/init.yml b/classes/cluster/virtual-mcp10-dvr/init.yml
index 5e74e05..6ca75fa 100644
--- a/classes/cluster/virtual-mcp10-dvr/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/init.yml
@@ -13,35 +13,28 @@
     cluster_domain: virtual-mcp10-dvr.local
     cluster_name: virtual-mcp10-dvr
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_database_address: 172.16.10.254
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
-    openstack_gateway_hostname: gtw
-    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node01_address: 172.16.10.94
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
+    openstack_gateway_address: 172.16.10.110
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
-
+    stacklight_log_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
index 45767fb..f5683a3 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -120,4 +120,13 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
-
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp10-ovs/init.yml b/classes/cluster/virtual-mcp10-ovs/init.yml
index aec02db..170698c 100644
--- a/classes/cluster/virtual-mcp10-ovs/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/init.yml
@@ -13,35 +13,25 @@
     cluster_domain: virtual-mcp10-ovs.local
     cluster_name: virtual-mcp10-ovs
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
-    openstack_gateway_hostname: gtw
-    openstack_gateway_address: ${_param:openstack_gateway_node01_address}
-    openstack_gateway_node01_hostname: gtw01
-    openstack_gateway_node01_address: 172.16.10.94
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-
+    openstack_gateway_address: 172.16.10.110
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
index eb5a477..b38bac6 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/init.yml
@@ -120,3 +120,13 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
index d9ffa88..78298cb 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
@@ -15,21 +15,22 @@
     cluster_name: virtual-mcp11-contrail-nfv
 
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
+
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node02_address}
+
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
@@ -41,19 +42,23 @@
     opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
 
-    opencontrail_control_address: ${_param:openstack_control_address}
-    opencontrail_control_node01_address: ${_param:openstack_control_node01_address}
-    opencontrail_control_node02_address: ${_param:openstack_control_node02_address}
-    opencontrail_control_node03_address: ${_param:openstack_control_node03_address}
+    opencontrail_control_address: 172.16.10.252
+    opencontrail_control_node01_address: 172.16.10.111
+    opencontrail_control_node02_address: 172.16.10.112
+    opencontrail_control_node03_address: 172.16.10.113
 
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
+
     stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+
+    openstack_compute_node01_hostname: cmp01
+    openstack_compute_node02_hostname: cmp02
 
   linux:
     network:
@@ -77,4 +82,4 @@
           address: ${_param:opencontrail_control_node03_address}
           names:
           - ntw03
-          - ntw03.${_param:cluster_domain}
+          - ntw03.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
index dd0e610..28b0404 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/init.yml
@@ -182,6 +182,16 @@
           names:
           - dbs03
           - dbs03.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 2c2d8b7..613edb9 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -21,21 +21,22 @@
     cluster_name: virtual-mcp11-contrail
 
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
+
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
+
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
+
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node02_address}
+
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
@@ -47,18 +48,19 @@
     opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
 
-    opencontrail_control_address: ${_param:openstack_control_address}
-    opencontrail_control_node01_address: ${_param:openstack_control_node01_address}
-    opencontrail_control_node02_address: ${_param:openstack_control_node02_address}
-    opencontrail_control_node03_address: ${_param:openstack_control_node03_address}
+    opencontrail_control_address: 172.16.10.252
+    opencontrail_control_node01_address: 172.16.10.111
+    opencontrail_control_node02_address: 172.16.10.112
+    opencontrail_control_node03_address: 172.16.10.113
 
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
     stacklight_log_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
 
   linux:
@@ -83,4 +85,4 @@
           address: ${_param:opencontrail_control_node03_address}
           names:
           - ntw03
-          - ntw03.${_param:cluster_domain}
+          - ntw03.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 9fe26a6..cb3d696 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -135,6 +135,16 @@
           names:
           - ctl03
           - ctl03.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index d8728d7..02f4581 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -20,31 +20,29 @@
     cluster_domain: virtual-mcp11-dvr.local
     cluster_name: virtual-mcp11-dvr
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_database_address: 172.16.10.254
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
+    openstack_database_node01_address: ${_param:openstack_control_node01_address}
+    openstack_database_node02_address: ${_param:openstack_control_node02_address}
+    openstack_database_node03_address: ${_param:openstack_control_node03_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
+    openstack_gateway_address: 172.16.10.110
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
     stacklight_log_address: ${_param:stacklight_monitor_address}
-    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+    stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
index 85e22c4..1d76d2d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/init.yml
@@ -125,6 +125,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
index 9ac4c6a..9cdfc51 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
@@ -14,32 +14,25 @@
     cluster_domain: virtual-mcp11-ovs-dpdk.local
     cluster_name: virtual-mcp11-ovs-dpdk
     # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
index fca0163..5391d23 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/init.yml
@@ -164,6 +164,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root:
diff --git a/classes/cluster/virtual-mcp11-ovs/init.yml b/classes/cluster/virtual-mcp11-ovs/init.yml
index f923170..6ee5cf7 100644
--- a/classes/cluster/virtual-mcp11-ovs/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/init.yml
@@ -14,33 +14,25 @@
     cluster_domain: virtual-mcp11-ovs.local
     cluster_name: virtual-mcp11-ovs
     # infra service addresses
-    # infra service addresses
-    infra_config_address: 172.16.10.90
+    infra_config_address: 172.16.10.100
     # openstack service addresses
-    openstack_proxy_hostname: prx
-    openstack_proxy_address: ${_param:openstack_proxy_node01_address}
-    openstack_proxy_node01_hostname: prx01
-    openstack_proxy_node01_address: ${_param:infra_config_address}
-    openstack_control_hostname: ctl
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
+    openstack_proxy_address: 172.16.10.121
+    openstack_proxy_node01_address: 172.16.10.121
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_address: 172.16.10.91
-    openstack_control_node02_address: 172.16.10.92
-    openstack_control_node03_address: 172.16.10.93
+    openstack_control_node01_address: 172.16.10.101
+    openstack_control_node02_address: 172.16.10.102
+    openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
-
     # stacklight service addresses
     stacklight_monitor_address: 172.16.10.253
     stacklight_monitor_node01_address: 172.16.10.107
     stacklight_monitor_node02_address: 172.16.10.108
     stacklight_monitor_node03_address: 172.16.10.109
-    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
-    stacklight_log_address: ${_param:stacklight_monitor_address}
     stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
-
+    stacklight_log_address: ${_param:stacklight_monitor_address}
+    openstack_gateway_address: 172.16.10.110
+    stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 83304b8..45fb5ca 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -122,6 +122,16 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
+        cmp01:
+          address: 172.16.10.105
+          names:
+          - cmp01
+          - cmp01.${_param:cluster_domain}
+        cmp02:
+          address: 172.16.10.106
+          names:
+          - cmp02
+          - cmp02.${_param:cluster_domain}
     system:
       user:
         root: