Fix region name configuration

The configuration name is os_region_name, not os_auth_region.

Change-Id: I0849c18c35b39335edda0cbc64c7fb4c5b145d44
Closes-bug: #1291030

diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 9eec3d330504dc570dc357eb0c8bf459308f35d0..2cfdba953cb33cacb3cff0a9e71188e788eedd90 100644 (file)
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -47,7 +47,7 @@ class ceilometer::agent::auth (
 
   ceilometer_config {
     'service_credentials/os_auth_url'    : value => $auth_url;
-    'service_credentials/os_auth_region' : value => $auth_region;
+    'service_credentials/os_region_name' : value => $auth_region;
     'service_credentials/os_username'    : value => $auth_user;
     'service_credentials/os_password'    : value => $auth_password;
     'service_credentials/os_tenant_name' : value => $auth_tenant_name;

diff --git a/spec/classes/ceilometer_agent_auth_spec.rb b/spec/classes/ceilometer_agent_auth_spec.rb
index ec3b5823b38128b3a926da2b91b5feb85bf83653..583bc4acfed867b68a2757fc3e4a2b7eb1fc0945 100644 (file)
--- a/spec/classes/ceilometer_agent_auth_spec.rb
+++ b/spec/classes/ceilometer_agent_auth_spec.rb
@@ -20,7 +20,7 @@ describe 'ceilometer::agent::auth' do
 
     it 'configures authentication' do
       should contain_ceilometer_config('service_credentials/os_auth_url').with_value('http://localhost:5000/v2.0')
-      should contain_ceilometer_config('service_credentials/os_auth_region').with_value('RegionOne')
+      should contain_ceilometer_config('service_credentials/os_region_name').with_value('RegionOne')
       should contain_ceilometer_config('service_credentials/os_username').with_value('ceilometer')
       should contain_ceilometer_config('service_credentials/os_password').with_value('password')
       should contain_ceilometer_config('service_credentials/os_tenant_name').with_value('services')