Fix contrail analytics ip in contrail lab and cmp hostnames

Change-Id: I6ba17485c27c382e13ad61afb6b11fd059ebd2f0
diff --git a/classes/cluster/os-ha-contrail/opencontrail/init.yml b/classes/cluster/os-ha-contrail/opencontrail/init.yml
index fea67dd..4462a20 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/os-ha-contrail/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}