From 18f6a9d164c53e955a34efc5a3c19ebc37ef8492 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathieu=20Gagne=CC=81?= Date: Tue, 11 Mar 2014 15:58:37 -0400 Subject: [PATCH] Fix region name configuration The configuration name is os_region_name, not os_auth_region. Change-Id: I0849c18c35b39335edda0cbc64c7fb4c5b145d44 Closes-bug: #1291030 --- manifests/agent/auth.pp | 2 +- spec/classes/ceilometer_agent_auth_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp index 9eec3d3..2cfdba9 100644 --- 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 ec3b582..583bc4a 100644 --- 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') -- 2.45.2