Closes-Bug: #1610506 - Ceilometer misconfigured due to param name mis…

…match

The param name used is ceilometer::mongo::password but should be ceilometer::mongo
One parameter for primary db had typo
Also rpc_backend needs to be removed from ceilometer.conf

Change-Id: I477537412ff248e7abd020640c7559ef3478c5cd

contrail/environment/hieradata/contrail-defaults.yaml

@@ -47,7 +47,7 @@ openstack::neutron::password: $openstack::keystone::admin_password
 openstack::neutron::shared_secret : $openstack::keystone::admin_password
 neutron::bind_port: '9697'
 ######## Ceilometer
-openstack::ceilometer::mongo::password: $openstack::keystone::admin_password
+openstack::ceilometer::mongo: $openstack::keystone::admin_password
 openstack::ceilometer::password: $openstack::keystone::admin_password
 openstack::ceilometer::meteringsecret: ''
 ######## Heat

contrail/environment/hieradata/openstack.yaml-example

@@ -70,7 +70,7 @@ openstack::neutron::password: 'c0ntrail123'
 openstack::neutron::shared_secret: 'by-sa-bo'
 
 ######## Ceilometer
-openstack::ceilometer::mongo::password: 'c0ntrail123'
+openstack::ceilometer::mongo: 'c0ntrail123'
 openstack::ceilometer::password: 'c0ntrail123'
 openstack::ceilometer::meteringsecret: 'ceilometersecretkey'
 

contrail/environment/modules/contrail/manifests/init.pp

@@ -838,7 +838,7 @@
     os_controller_api_address => hiera(openstack::controller::address::api, $os_controller_api_address),
     os_keystone_admin_email   => hiera(openstack::keystone::admin_email, $keystone_admin_email),
     os_keystone_admin_token   => hiera(openstack::keystone::admin_token, $keystone_admin_token),
-    os_mongo_password         => hiera(openstack::ceilometer::mongo::password, $os_mongo_password),
+    os_mongo_password         => hiera(openstack::ceilometer::mongo, $os_mongo_password),
     os_metering_secret        => hiera(openstack::ceilometer::meteringsecret, $os_metering_secret),
     os_ceilometer_password    => hiera(openstack::ceilometer::password, $os_ceilometer_password),
 

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_non_mgmt_ip
       $port = ':27017'
       $contrail_logoutput = $::contrail::params::contrail_logoutput
 

contrail/environment/modules/contrail/manifests/profile/openstack/ceilometer.pp

@@ -37,8 +37,13 @@
     ensure => file,
     content => template('contrail/pipeline.yaml.erb'),
   } ->
-  class { '::ceilometer::agent::central':}
-
+  class { '::ceilometer::agent::central':} ->
+  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':
     }