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: