From 8dd38bdcc3730d0375cb6f24255246d2d750de27 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 11 Feb 2014 16:18:03 +0100 Subject: [PATCH] telemetry: honour region name Close bug #219 Signed-off-by: Emilien Macchi --- manifests/telemetry.pp | 7 +++++++ spec/classes/cloud_telemetry_centralagent_spec.rb | 4 +++- spec/classes/cloud_telemetry_server_spec.rb | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index a3f300a4..cbe9cd3f 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -64,6 +64,11 @@ # (optional) Syslog facility to receive log lines # Defaults value in params # +# [*region*] +# (optional) the keystone region of this node +# Defaults value in params +# + class cloud::telemetry( $ceilometer_secret = $os_params::ceilometer_secret, $rabbit_hosts = $os_params::rabbit_hosts, @@ -72,6 +77,7 @@ class cloud::telemetry( $ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_ceilometer_password = $os_params::ks_ceilometer_password, + $region = $os_params::region, $verbose = $os_params::verbose, $debug = $os_params::debug, $log_facility = $os_params::log_facility, @@ -92,6 +98,7 @@ class cloud::telemetry( class { 'ceilometer::agent::auth': auth_url => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0", auth_password => $ks_ceilometer_password, + auth_region => $region } } diff --git a/spec/classes/cloud_telemetry_centralagent_spec.rb b/spec/classes/cloud_telemetry_centralagent_spec.rb index c9018d95..7ecf7131 100644 --- a/spec/classes/cloud_telemetry_centralagent_spec.rb +++ b/spec/classes/cloud_telemetry_centralagent_spec.rb @@ -31,6 +31,7 @@ describe 'cloud::telemetry::centralagent' do ks_keystone_internal_port => '5000', ks_keystone_internal_proto => 'http', ks_ceilometer_password => 'secrete', + region => 'MyRegion', log_facility => 'LOG_LOCAL0', use_syslog => true, verbose => true, @@ -54,7 +55,8 @@ describe 'cloud::telemetry::centralagent' do ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', - :auth_url => 'http://10.0.0.1:5000/v2.0' + :auth_url => 'http://10.0.0.1:5000/v2.0', + :auth_region => 'MyRegion' ) end diff --git a/spec/classes/cloud_telemetry_server_spec.rb b/spec/classes/cloud_telemetry_server_spec.rb index 8db20d96..41d3a8ff 100644 --- a/spec/classes/cloud_telemetry_server_spec.rb +++ b/spec/classes/cloud_telemetry_server_spec.rb @@ -31,6 +31,7 @@ describe 'cloud::telemetry::server' do ks_keystone_internal_port => '5000', ks_keystone_internal_proto => 'http', ks_ceilometer_password => 'secrete', + region => 'MyRegion', log_facility => 'LOG_LOCAL0', use_syslog => true, verbose => true, @@ -59,7 +60,8 @@ describe 'cloud::telemetry::server' do ) should contain_class('ceilometer::agent::auth').with( :auth_password => 'secrete', - :auth_url => 'http://10.0.0.1:5000/v2.0' + :auth_url => 'http://10.0.0.1:5000/v2.0', + :auth_region => 'MyRegion' ) end