diff --git a/classes/cluster/os_aio_contrail/opencontrail/init.yml b/classes/cluster/os_aio_contrail/opencontrail/init.yml
index 102198a..e5a5398 100644
--- a/classes/cluster/os_aio_contrail/opencontrail/init.yml
+++ b/classes/cluster/os_aio_contrail/opencontrail/init.yml
@@ -1,9 +1,9 @@
 parameters:
   _param:
-    opencontrail_analytics_address: ${_param:openstack_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}
+    opencontrail_analytics_address: ${_param:opencontrail_control_address}
+    opencontrail_analytics_node01_address: ${_param:opencontrail_control_node01_address}
+    opencontrail_analytics_node02_address: ${_param:opencontrail_control_node02_address}
+    opencontrail_analytics_node03_address: ${_param:opencontrail_control_node03_address}
 
     opencontrail_control_address: 172.16.10.252
     opencontrail_control_node01_hostname: ntw01
diff --git a/classes/cluster/os_aio_contrail/openstack/init.yml b/classes/cluster/os_aio_contrail/openstack/init.yml
index 1359663..5cb637a 100755
--- a/classes/cluster/os_aio_contrail/openstack/init.yml
+++ b/classes/cluster/os_aio_contrail/openstack/init.yml
@@ -30,6 +30,7 @@
     rabbitmq_admin_password: workshop
     rabbitmq_openstack_password: workshop
     rabbitmq_cold_password: workshop
+    cluster_node01_address: ${_param:openstack_control_address}
     cluster_vip_address: ${_param:openstack_control_address}
     glance_version: ${_param:openstack_version}
     glance_service_host: ${_param:openstack_control_address}
@@ -88,7 +89,8 @@
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     ceilometer_database_host: ${_param:openstack_control_node01_address}
     stacklight_monitor_address: ${_param:openstack_control_node01_address}
-
+    stacklight_monitor_node01_address: ${_param:openstack_control_node01_address}
+    ceilometer_influxdb_password: workshop
   linux:
     network:
       host:
diff --git a/classes/system b/classes/system
index 16a320e..cb02e31 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 16a320eb00a7f557198c4542b644683524c5ae6e
+Subproject commit cb02e3183e80d35bd51aee6d1fd6666357c32777