openstack/puppet-ceilometer
Code Issues Proposed changes

Set auth_region to $::os_service_default

Browse Source 
This patch:
    * sets auth_region to the default value in OpenStack using
      $::os_service_default

Change-Id: I347ecf1f4c7a09c4e59927086a4808463c05f5c7
This commit is contained in:
luyuan 2016-01-13 01:06:21 +08:00
parent f6e0e94acf
commit 540b456c86
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agent/auth.pp
View File

@ -11,7 +11,7 @@
#
# [*auth_region*]
# (Optional) the keystone region of this node
# Defaults to 'RegionOne'.
# Defaults to $::os_service_default.
#
# [*auth_user*]
# (Optional) the keystone user for ceilometer services
@ -40,7 +40,7 @@
class ceilometer::agent::auth (
$auth_password,
$auth_url = 'http://localhost:5000/v2.0',
$auth_region = 'RegionOne',
$auth_region = $::os_service_default,
$auth_user = 'ceilometer',
$auth_tenant_name = 'services',
$auth_tenant_id = undef,

4
spec/classes/ceilometer_agent_auth_spec.rb
View File

@ -8,7 +8,7 @@ describe 'ceilometer::agent::auth' do
let :params do
{ :auth_url => 'http://localhost:5000/v2.0',
:auth_region => 'RegionOne',
:auth_region => '<SERVICE DEFAULT>',
:auth_user => 'ceilometer',
:auth_password => 'password',
:auth_tenant_name => 'services',
@ -19,7 +19,7 @@ describe 'ceilometer::agent::auth' do
it 'configures authentication' do
is_expected.to contain_ceilometer_config('service_credentials/os_auth_url').with_value('http://localhost:5000/v2.0')
is_expected.to contain_ceilometer_config('service_credentials/os_region_name').with_value('RegionOne')
is_expected.to contain_ceilometer_config('service_credentials/os_region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ceilometer_config('service_credentials/os_username').with_value('ceilometer')
is_expected.to contain_ceilometer_config('service_credentials/os_password').with_value('password')
is_expected.to contain_ceilometer_config('service_credentials/os_password').with_value(params[:auth_password]).with_secret(true)