From d1224c445bc66d731a70000b2a85f145f40d70eb Mon Sep 17 00:00:00 2001
From: ericzhou <zyouzhou@cn.ibm.com>
Date: Tue, 11 Mar 2014 16:13:45 +0800
Subject: [PATCH] Add metering_secret configuration to ceilometer.conf.

Change-Id: I639ad3bebf489367ad8ed182c276fc32eec8d369
Closes-Bug: #1290721
---
 recipes/common.rb                     | 5 ++++-
 spec/common_spec.rb                   | 5 +++++
 spec/spec_helper.rb                   | 3 +++
 templates/default/ceilometer.conf.erb | 3 +++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/recipes/common.rb b/recipes/common.rb
index 5a974e9..827b65c 100644
--- a/recipes/common.rb
+++ b/recipes/common.rb
@@ -59,6 +59,8 @@ Chef::Log.debug("openstack-telemetry::common:service_user|#{service_user}")
 Chef::Log.debug("openstack-telemetry::common:service_tenant|#{service_tenant}")
 Chef::Log.debug("openstack-telemetry::common:identity_endpoint|#{identity_endpoint.to_s}")
 
+metering_secret = secret 'secrets', 'openstack_metering_secret'
+
 directory node['openstack']['telemetry']['conf_dir'] do
   owner node['openstack']['telemetry']['user']
   group node['openstack']['telemetry']['group']
@@ -83,7 +85,8 @@ template node['openstack']['telemetry']['conf'] do
     mq_password: mq_password,
     service_pass: service_pass,
     service_tenant_name: service_tenant,
-    service_user: service_user
+    service_user: service_user,
+    metering_secret: metering_secret
   )
 end
 
diff --git a/spec/common_spec.rb b/spec/common_spec.rb
index 5704ddc..9d0209b 100644
--- a/spec/common_spec.rb
+++ b/spec/common_spec.rb
@@ -145,6 +145,11 @@ describe 'openstack-telemetry::common' do
             /^#{Regexp.quote('signing_dir = /var/cache/ceilometer/api')}$/)
         end
       end
+
+      it 'has metering secret' do
+        r = /^metering_secret = metering_secret$/
+        expect(chef_run).to render_file(file.name).with_content(r)
+      end
     end
 
     describe 'policy.json' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 688885d..04033cb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -35,6 +35,9 @@ shared_context 'telemetry-stubs' do
     Chef::Recipe.any_instance.stub(:secret)
       .with('secrets', 'openstack_identity_bootstrap_token')
       .and_return('bootstrap-token')
+    Chef::Recipe.any_instance.stub(:secret)
+      .with('secrets', 'openstack_metering_secret')
+      .and_return('metering_secret')
     Chef::Application.stub(:fatal!)
   end
 end
diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb
index 6ca9ab7..e773b38 100644
--- a/templates/default/ceilometer.conf.erb
+++ b/templates/default/ceilometer.conf.erb
@@ -65,3 +65,6 @@ admin_tenant_name = <%= @service_tenant_name %>
 admin_user = <%= @service_user %>
 admin_password = <%= @service_pass %>
 signing_dir = <%= node["openstack"]["telemetry"]["api"]["auth"]["cache_dir"] %>
+
+[publisher_rpc]
+metering_secret = <%= @metering_secret %>