diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
index ad22679..750dbc0 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    opencontrail_analytics_address: ${_param:openstack_control_address}
+    opencontrail_analytics_address: ${_param:opencontrail_control_address}
     opencontrail_analytics_node01_address: ${_param:openstack_control_node01_address}
     opencontrail_analytics_node02_address: ${_param:openstack_control_node02_address}
     opencontrail_analytics_node03_address: ${_param:openstack_control_node03_address}
diff --git a/classes/cluster/os-ha-contrail-40/openstack/init.yml b/classes/cluster/os-ha-contrail-40/openstack/init.yml
index cdcfd10..6ecca65 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/init.yml
@@ -29,8 +29,8 @@
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
 
-    openstack_compute_node01_hostname: cmp01
-    openstack_compute_node02_hostname: cmp02
+    openstack_compute_node01_hostname: cmp0
+    openstack_compute_node02_hostname: cmp1
     openstack_compute_node01_address: 172.16.10.105
     openstack_compute_node02_address: 172.16.10.106