diff --git a/contrail/environment/modules/contrail/manifests/profile/compute.pp b/contrail/environment/modules/contrail/manifests/profile/compute.pp
index 77f32ef7..8337cf73 100644
--- a/contrail/environment/modules/contrail/manifests/profile/compute.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/compute.pp
@@ -24,7 +24,12 @@
         if ($enable_ceilometer) {
             contain ::openstack::profile::ceilometer::agent
             contain ::contrail::ceilometer::agent::auth
-            Class['::openstack::profile::ceilometer::agent']->Class['::contrail::ceilometer::agent::auth']->Class['::openstack::profile::firewall']
+            Class['::openstack::profile::ceilometer::agent']->Class['::contrail::ceilometer::agent::auth']->Class['::openstack::profile::firewall']->
+            contrail::lib::augeas_conf_rm { "ceilometer_rpc_backend":
+                key => 'rpc_backend',
+                config_file => '/etc/ceilometer/ceilometer.conf',
+                lens_to_use => 'properties.lns'
+            }
         }
     } elsif ((!("compute" in $host_roles)) and ($contrail_roles["compute"] == true)) {
         notify { "uninstalling compute":; }
diff --git a/contrail/environment/modules/contrail/manifests/profile/mongodb.pp b/contrail/environment/modules/contrail/manifests/profile/mongodb.pp
index dfb4336d..6b65efeb 100644
--- a/contrail/environment/modules/contrail/manifests/profile/mongodb.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/mongodb.pp
@@ -10,10 +10,10 @@
       $mongo_slave_ip_list_str = inline_template('<%= @database_ip_list.delete_if {|x| x == @primary_db_ip }.join(";") %>')
       $mongo_slave_ip_list = split($mongo_slave_ip_list_str, ';')
       notify { "contrail::profile::mongodb - mongo_slave_ip_list = ${mongo_slave_ip_list}":;}
-      $ceilometer_mongo_password = hiera(openstack::ceilometer::mongo::password)
+      $ceilometer_mongo_password = hiera(openstack::ceilometer::mongo)
       $ceilometer_password = hiera(openstack::ceilometer::password)
       $ceilometer_meteringsecret = hiera(openstack::ceilometer::meteringsecret)
-      $mongodb_bind_address = $contrail::params::host_non_mgmt_ip
+      $mongodb_bind_address = $::contrail::params::host_ip
       $port = ':27017'
       $contrail_logoutput = $::contrail::params::contrail_logoutput
 
diff --git a/contrail/environment/modules/openstack/manifests/common/ceilometer.pp b/contrail/environment/modules/openstack/manifests/common/ceilometer.pp
index 1f172a34..58a996df 100644
--- a/contrail/environment/modules/openstack/manifests/common/ceilometer.pp
+++ b/contrail/environment/modules/openstack/manifests/common/ceilometer.pp
@@ -11,7 +11,7 @@
   $internal_vip = $::contrail::params::internal_vip
   $analytics_node_ip = $::contrail::params::collector_ip_to_use
 
-  $ceilometer_mongo_password = hiera(openstack::ceilometer::mongo::password)
+  $ceilometer_mongo_password = hiera(openstack::ceilometer::mongo)
   $ceilometer_password = hiera(openstack::ceilometer::password)
   $ceilometer_meteringsecret = hiera(openstack::ceilometer::meteringsecret)
 
diff --git a/contrail/environment/modules/openstack/manifests/init.pp b/contrail/environment/modules/openstack/manifests/init.pp
index d8f60d66..843bcdc0 100644
--- a/contrail/environment/modules/openstack/manifests/init.pp
+++ b/contrail/environment/modules/openstack/manifests/init.pp
@@ -345,7 +345,7 @@
       neutron_type_drivers          => hiera(openstack::neutron::neutron_type_drivers, $neutron_type_drivers),
       neutron_mechanism_drivers     => hiera(openstack::neutron::neutron_mechanism_drivers, $neutron_mechanism_drivers),
       neutron_tunnel_id_ranges      => hiera(openstack::neutron::neutron_tunnel_id_ranges, $neutron_tunnel_id_ranges),
-      ceilometer_mongo_password     => hiera(openstack::ceilometer::mongo::password),
+      ceilometer_mongo_password     => hiera(openstack::ceilometer::mongo),
       ceilometer_password           => hiera(openstack::ceilometer::password),
       ceilometer_meteringsecret     => hiera(openstack::ceilometer::meteringsecret),
       heat_password                 => hiera(openstack::heat::password),