Add metering_secret configuration to ceilometer.conf.
Change-Id: I639ad3bebf489367ad8ed182c276fc32eec8d369 Closes-Bug: #1290721
This commit is contained in:
parent
5ae67ff44f
commit
d1224c445b
@ -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:service_tenant|#{service_tenant}")
|
||||||
Chef::Log.debug("openstack-telemetry::common:identity_endpoint|#{identity_endpoint.to_s}")
|
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
|
directory node['openstack']['telemetry']['conf_dir'] do
|
||||||
owner node['openstack']['telemetry']['user']
|
owner node['openstack']['telemetry']['user']
|
||||||
group node['openstack']['telemetry']['group']
|
group node['openstack']['telemetry']['group']
|
||||||
@ -83,7 +85,8 @@ template node['openstack']['telemetry']['conf'] do
|
|||||||
mq_password: mq_password,
|
mq_password: mq_password,
|
||||||
service_pass: service_pass,
|
service_pass: service_pass,
|
||||||
service_tenant_name: service_tenant,
|
service_tenant_name: service_tenant,
|
||||||
service_user: service_user
|
service_user: service_user,
|
||||||
|
metering_secret: metering_secret
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -145,6 +145,11 @@ describe 'openstack-telemetry::common' do
|
|||||||
/^#{Regexp.quote('signing_dir = /var/cache/ceilometer/api')}$/)
|
/^#{Regexp.quote('signing_dir = /var/cache/ceilometer/api')}$/)
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|
||||||
describe 'policy.json' do
|
describe 'policy.json' do
|
||||||
|
@ -35,6 +35,9 @@ shared_context 'telemetry-stubs' do
|
|||||||
Chef::Recipe.any_instance.stub(:secret)
|
Chef::Recipe.any_instance.stub(:secret)
|
||||||
.with('secrets', 'openstack_identity_bootstrap_token')
|
.with('secrets', 'openstack_identity_bootstrap_token')
|
||||||
.and_return('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!)
|
Chef::Application.stub(:fatal!)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -65,3 +65,6 @@ admin_tenant_name = <%= @service_tenant_name %>
|
|||||||
admin_user = <%= @service_user %>
|
admin_user = <%= @service_user %>
|
||||||
admin_password = <%= @service_pass %>
|
admin_password = <%= @service_pass %>
|
||||||
signing_dir = <%= node["openstack"]["telemetry"]["api"]["auth"]["cache_dir"] %>
|
signing_dir = <%= node["openstack"]["telemetry"]["api"]["auth"]["cache_dir"] %>
|
||||||
|
|
||||||
|
[publisher_rpc]
|
||||||
|
metering_secret = <%= @metering_secret %>
|
||||||
|
Loading…
Reference in New Issue
Block a user