Set auth_region to $::os_service_default

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

Change-Id: I347ecf1f4c7a09c4e59927086a4808463c05f5c7

diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 9304d377547cec5b443a9d01c087053e06616920..b1cf89c4555f31cd8e49bbbaf711db3496a5df78 100644 (file)
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -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,

diff --git a/spec/classes/ceilometer_agent_auth_spec.rb b/spec/classes/ceilometer_agent_auth_spec.rb
index fa803211758273aead5552892c5dd8c9412159f5..74203bb1043a4844e28a72b424cf2b3cc28ca4ae 100644 (file)
--- a/spec/classes/ceilometer_agent_auth_spec.rb
+++ b/spec/classes/ceilometer_agent_auth_spec.rb
@@ -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)