diff --git a/contrail/environment/modules/contrail/manifests/profile/compute.pp b/contrail/environment/modules/contrail/manifests/profile/compute.pp
index fc1865e5..e524c727 100644
--- a/contrail/environment/modules/contrail/manifests/profile/compute.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/compute.pp
@@ -31,15 +31,10 @@
                 debug           => $openstack_verbose,
                 verbose         => $openstack_debug,
                 rabbit_hosts    => $openstack_rabbit_servers,
+                rpc_backend     => 'rabbit',
               }
             }
             class { '::ceilometer::agent::compute': }
-            ->
-            contrail::lib::augeas_conf_rm { "ceilometer_compute_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/openstack/ceilometer.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
index 6e99907b..68cc6f77 100644
--- a/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp
@@ -31,6 +31,11 @@
   $auth_username = 'ceilometer'
   if (internal_vip!='') {
     $coordination_url = join(["kazoo://", $database_ip_to_use, ':2181'])
+    Class['::ceilometer']->
+    ceilometer_config {
+      'notification/workload_partitioning' : value => 'True';
+      'compute/workload_partitioning'      : value => 'True';
+    }
   } else {
     $coordination_url = undef
   }
@@ -43,37 +48,26 @@
     rabbit_use_ssl     => $rabbit_use_ssl,
     kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
     kombu_ssl_certfile => $kombu_ssl_certfile,
-    kombu_ssl_keyfile  => $kombu_ssl_keyfile
-  } ->
-  file { '/etc/ceilometer/pipeline.yaml':
-    ensure => file,
-    content => template('contrail/pipeline.yaml.erb'),
+    kombu_ssl_keyfile  => $kombu_ssl_keyfile,
+    rpc_backend        => 'rabbit'
   } ->
-  class { '::ceilometer::agent::central':
-    coordination_url => $coordination_url
-  }
-  if $::osfamily != 'Debian' {
-    class { '::ceilometer::alarm::notifier':
-    } ->
-    class { '::ceilometer::alarm::evaluator':
-      coordination_url => $coordination_url
-    }
-  }
-  if (internal_vip!='') {
-     Contrail::Lib::Augeas_conf_rm['ceilometer_rpc_backend']->
-     ceilometer_config {
-      'notification/workload_partitioning' : value => 'True';
-      'compute/workload_partitioning'      : value => 'True';
-     }
-  }
+  class { '::ceilometer::db':
+    database_connection => $mongo_connection
+  }->
   class { '::ceilometer::agent::auth':
     auth_url         => $auth_url,
     auth_password    => $auth_password,
     auth_tenant_name => $auth_tenant_name,
     auth_user        => $auth_username,
   }
-  class { '::ceilometer::db':
-    database_connection => $mongo_connection
+  ->
+  class { '::ceilometer::collector': } ->
+  file { '/etc/ceilometer/pipeline.yaml':
+    ensure => file,
+    content => template('contrail/pipeline.yaml.erb'),
+  } ->
+  class { '::ceilometer::agent::central':
+    coordination_url => $coordination_url
   }
   case $package_sku {
     /13\.0/: {
@@ -92,12 +86,12 @@
       }
     }
   }
-  class { '::ceilometer::collector': }
-
-  contrail::lib::augeas_conf_rm { "ceilometer_rpc_backend":
-        key => 'rpc_backend',
-        config_file => '/etc/ceilometer/ceilometer.conf',
-        lens_to_use => 'properties.lns',
-        match_value => 'ceilometer.openstack.common.rpc.impl_kombu',
+  if $::osfamily != 'Debian' {
+    class { '::ceilometer::alarm::notifier':
+    } ->
+    class { '::ceilometer::alarm::evaluator':
+      coordination_url => $coordination_url
+    }
   }
+
 }