Update ceilometer conf files for Juno
* Update conf - remove paste filter, handled in paste.ini * Update specs as needed Change-Id: Ie275475490caec0ab1d08b7f39dc195b269b7592 Closes-Bug: #1353047
This commit is contained in:
parent
4529146a83
commit
6366bb9f08
|
@ -4,6 +4,7 @@ This file is used to list changes made in each version of the openstack-metering
|
|||
|
||||
## 10.0.1
|
||||
* Support vmware hypervisor
|
||||
* Sync conf files with Juno
|
||||
|
||||
## 10.0.0
|
||||
* Upgrading to Juno
|
||||
|
|
|
@ -25,26 +25,26 @@ UBUNTU_OPTS = {
|
|||
|
||||
shared_context 'telemetry-stubs' do
|
||||
before do
|
||||
Chef::Recipe.any_instance.stub(:memcached_servers).and_return([])
|
||||
Chef::Recipe.any_instance.stub(:get_password)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:memcached_servers).and_return([])
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||
.with('db', anything)
|
||||
.and_return('')
|
||||
Chef::Recipe.any_instance.stub(:get_password)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||
.with('service', 'openstack-ceilometer')
|
||||
.and_return('ceilometer-pass')
|
||||
Chef::Recipe.any_instance.stub(:get_password)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||
.with('user', 'guest')
|
||||
.and_return('mq-pass')
|
||||
Chef::Recipe.any_instance.stub(:get_secret)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
|
||||
.with('openstack_identity_bootstrap_token')
|
||||
.and_return('bootstrap-token')
|
||||
Chef::Recipe.any_instance.stub(:get_secret)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
|
||||
.with('openstack_metering_secret')
|
||||
.and_return('metering_secret')
|
||||
Chef::Recipe.any_instance.stub(:get_secret)
|
||||
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
|
||||
.with('openstack_vmware_secret_name')
|
||||
.and_return 'vmware_secret_name'
|
||||
Chef::Application.stub(:fatal!)
|
||||
allow(Chef::Application).to receive(:fatal!)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -62,7 +62,6 @@ host = <%= @api_bind_host %>
|
|||
port = <%= @api_bind_port %>
|
||||
|
||||
[keystone_authtoken]
|
||||
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
|
||||
auth_uri = <%= @auth_uri %>
|
||||
auth_host = <%= @identity_admin_endpoint.host %>
|
||||
auth_port = <%= @identity_admin_endpoint.port %>
|
||||
|
|
Loading…
Reference in New Issue