Set os_region_name with ceilometer region

Change-Id: Ia4b73df9380d4dbc5038428adf340ecdae601c69
Closes-Bug: #1357461
This commit is contained in:
Mark Vanderwiel 2014-08-15 11:56:56 -05:00
parent 6366bb9f08
commit a689c6741c
3 changed files with 9 additions and 0 deletions

View File

@ -5,6 +5,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
* Set os_region_name properly
## 10.0.0
* Upgrading to Juno

View File

@ -61,6 +61,11 @@ describe 'openstack-telemetry::common' do
/^sample_source = openstack$/)
end
it 'has default os_region_name set' do
expect(chef_run).to render_file(file.name).with_content(
/^os_region_name = RegionOne$/)
end
it 'has sample_source set' do
node.set['openstack']['telemetry']['sample_source'] = 'RegionOne'
expect(chef_run).to render_file(file.name).with_content(

View File

@ -88,3 +88,6 @@ api_retry_count = <%= node['openstack']['compute']['vmware']['api_retry_count']
wsdl_location = <%= node['openstack']['compute']['vmware']['wsdl_location'] %>
<% end %>
<% end %>
[service_credentials]
os_region_name = <%= node['openstack']['telemetry']['region'] %>