diff --git a/classes/cluster/sl-os-contrail/openstack/init.yml b/classes/cluster/sl-os-contrail/openstack/init.yml
index ebaf4ae..c600e35 100755
--- a/classes/cluster/sl-os-contrail/openstack/init.yml
+++ b/classes/cluster/sl-os-contrail/openstack/init.yml
@@ -1,43 +1,26 @@
 parameters:
   _param:
     openstack_proxy_address: 172.16.10.121
-    openstack_proxy_node01_hostname: prx01
     openstack_proxy_node01_address: 172.16.10.121
-
     openstack_control_address: 172.16.10.254
-    openstack_control_node01_hostname: ctl01
-    openstack_control_node02_hostname: ctl02
-    openstack_control_node03_hostname: ctl03
     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_hostname: dbs01
-    openstack_database_node02_hostname: dbs02
-    openstack_database_node03_hostname: dbs03
     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_hostname: msg01
-    openstack_message_queue_node02_hostname: msg02
-    openstack_message_queue_node03_hostname: msg03
     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_compute_node01_hostname: cmp01
-    openstack_compute_node02_hostname: cmp02
-    openstack_compute_node01_address: 172.16.10.105
-    openstack_compute_node02_address: 172.16.10.106
-
     openstack_version: ocata
     apt_mk_version: nightly
     openstack_region: RegionOne
     admin_email: root@localhost
-    cluster_public_host: ${_param:openstack_control_address}
+    cluster_public_host: 172.16.10.254
+    neutron_public_protocol: http
+    cluster_public_protocol: http
     opencontrail_version: 3.0
     opencontrail_compute_dns: 8.8.8.8
     opencontrail_stats_password: contrail123
@@ -48,7 +31,6 @@
     rabbitmq_admin_password: workshop
     rabbitmq_openstack_password: workshop
     rabbitmq_cold_password: workshop
-    designate_admin_api_enabled: true
     designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
     designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
     designate_pool_ns_records:
@@ -85,20 +67,27 @@
     heat_version: ${_param:openstack_version}
     heat_service_host: ${_param:openstack_control_address}
     heat_domain_admin_password: workshop
+    ceilometer_version: ${_param:openstack_version}
+    ceilometer_service_host: ${_param:openstack_control_address}
+    aodh_version: ${_param:openstack_version}
+    aodh_service_host: ${_param:openstack_control_address}
     cinder_version: ${_param:openstack_version}
     cinder_service_host: ${_param:openstack_control_address}
+    ceilometer_graphite_publisher_host: 172.16.10.107
+    ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
     nova_service_host: ${_param:openstack_control_address}
     nova_vncproxy_url: http://${_param:openstack_control_address}:8060
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:openstack_control_address}
     glusterfs_service_host: ${_param:openstack_control_address}
-    designate_version: ${_param:openstack_version}
     designate_service_host: ${_param:openstack_control_address}
     mysql_admin_user: root
     mysql_admin_password: workshop
+    mysql_aodh_password: workshop
     mysql_designate_password: workshop
     mysql_cinder_password: workshop
+    mysql_ceilometer_password: workshop
     mysql_glance_password: workshop
     mysql_grafana_password: workshop
     mysql_heat_password: workshop
@@ -107,6 +96,8 @@
     mysql_nova_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
+    keystone_aodh_password: workshop
+    keystone_ceilometer_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
     keystone_heat_password: workshop
@@ -114,20 +105,23 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     keystone_designate_password: workshop
-    keystone_aodh_password: workshop
-    keystone_ceilometer_password: workshop
+    ceilometer_secret_key: workshop
     metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:openstack_control_address}
     horizon_identity_encryption: none
     horizon_identity_version: 2
-    aodh_version: ${_param:openstack_version}
-    aodh_service_host: ${_param:cluster_vip_address}
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: ${_param:cluster_vip_address}
+    mongodb_server_replica_set: ceilometer
+    mongodb_ceilometer_password: cloudlab
+    mongodb_admin_password: cloudlab
+    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+    ceilometer_influxdb_password: lmapass
+    openstack_log_appender: true
+    openstack_fluentd_handler_enabled: true
   linux:
     network:
+      purge_hosts: true
       host:
         prx:
           address: ${_param:openstack_proxy_address}
@@ -137,7 +131,7 @@
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - ${_param:openstack_proxy_node01_hostname}
+          - prx01
           - prx01.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
@@ -147,65 +141,30 @@
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ${_param:openstack_control_node01_hostname}
-          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+          - ctl01
+          - ctl01.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ${_param:openstack_control_node02_hostname}
-          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+          - ctl02
+          - ctl02.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ${_param:openstack_control_node03_hostname}
-          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
-        msg:
-          address: ${_param:openstack_message_queue_address}
-          names:
-          - msg
-          - msg.${_param:cluster_domain}
-        msg01:
-          address: ${_param:openstack_message_queue_node01_address}
-          names:
-          - ${_param:openstack_message_queue_node01_hostname}
-          - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
-        msg02:
-          address: ${_param:openstack_message_queue_node02_address}
-          names:
-          - ${_param:openstack_message_queue_node02_hostname}
-          - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
-        msg03:
-          address: ${_param:openstack_message_queue_node03_address}
-          names:
-          - ${_param:openstack_message_queue_node03_hostname}
-          - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
-        dbs:
-          address: ${_param:openstack_database_address}
-          names:
-          - dbs
-          - dbs.${_param:cluster_domain}
-        dbs01:
-          address: ${_param:openstack_database_node01_address}
-          names:
-          - ${_param:openstack_database_node01_hostname}
-          - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
-        dbs02:
-          address: ${_param:openstack_database_node02_address}
-          names:
-          - ${_param:openstack_database_node02_hostname}
-          - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
-        dbs03:
-          address: ${_param:openstack_database_node03_address}
-          names:
-          - ${_param:openstack_database_node03_hostname}
-          - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+          - ctl03
+          - ctl03.${_param:cluster_domain}
         cmp01:
-          address: ${_param:openstack_compute_node01_address}
+          address: 172.16.10.105
           names:
-          - ${_param:openstack_compute_node01_hostname}
-          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+          - cmp01
+          - cmp01.${_param:cluster_domain}
         cmp02:
-          address: ${_param:openstack_compute_node02_address}
+          address: 172.16.10.106
           names:
-          - ${_param:openstack_compute_node02_hostname}
-          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+          - cmp02
+          - cmp02.${_param:cluster_domain}
+    system:
+      user:
+        root:
+          name: root
+          password: false