diff --git a/classes/cluster/os_ha_ovs/infra/config.yml b/classes/cluster/os_ha_ovs/infra/config.yml
index 3c16c65..7d36a2b 100644
--- a/classes/cluster/os_ha_ovs/infra/config.yml
+++ b/classes/cluster/os_ha_ovs/infra/config.yml
@@ -10,11 +10,17 @@
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
 - system.keystone.client.single
-- system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
 - system.keystone.client.service.glare
 - system.keystone.client.service.cinder3
-- system.mysql.client.single
+- system.mysql.client
+- system.mysql.client.database.cinder
+- system.mysql.client.database.glance
+- system.mysql.client.database.heat
+- system.mysql.client.database.keystone
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.neutron
 - system.reclass.storage.system.openstack_control_cluster
 - cluster.os_ha_ovs.openstack.proxy
 - cluster.os_ha_ovs.openstack.dashboard
diff --git a/classes/cluster/os_ha_ovs/openstack/control.yml b/classes/cluster/os_ha_ovs/openstack/control.yml
index 270b724..742153a 100644
--- a/classes/cluster/os_ha_ovs/openstack/control.yml
+++ b/classes/cluster/os_ha_ovs/openstack/control.yml
@@ -21,7 +21,6 @@
 - system.cinder.control.cluster
 - system.heat.server.cluster
 - system.galera.server.cluster
-- system.galera.server.database.ceilometer
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
 - system.galera.server.database.heat
diff --git a/classes/cluster/os_ha_ovs/openstack/init.yml b/classes/cluster/os_ha_ovs/openstack/init.yml
index 3c060f1..fc7c24c 100644
--- a/classes/cluster/os_ha_ovs/openstack/init.yml
+++ b/classes/cluster/os_ha_ovs/openstack/init.yml
@@ -56,12 +56,8 @@
     heat_version: ${_param:openstack_version}
     heat_service_host: ${_param:cluster_vip_address}
     heat_domain_admin_password: workshop
-    ceilometer_version: ${_param:openstack_version}
-    ceilometer_service_host: 172.16.10.108
     cinder_version: ${_param:openstack_version}
     cinder_service_host: ${_param:cluster_vip_address}
-    ceilometer_graphite_publisher_host: 172.16.10.107
-    ceilometer_graphite_publisher_port: 2013
     nova_version: ${_param:openstack_version}
     nova_service_host: ${_param:cluster_vip_address}
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
@@ -72,33 +68,25 @@
     mysql_admin_user: root
     mysql_admin_password: workshop
     mysql_cinder_password: workshop
-    mysql_ceilometer_password: workshop
     mysql_glance_password: workshop
     mysql_heat_password: workshop
     mysql_keystone_password: workshop
     mysql_neutron_password: workshop
     mysql_nova_password: workshop
-    mysql_aodh_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
-    keystone_ceilometer_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
     keystone_heat_password: workshop
     keystone_keystone_password: workshop
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
-    ceilometer_secret_key: workshop
     metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
     horizon_identity_encryption: none
     horizon_identity_version: 2
-    mongodb_server_replica_set: ceilometer
-    mongodb_ceilometer_password: cloudlab
-    mongodb_admin_password: cloudlab
-    mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
   linux:
     network:
       host: