stackforge/puppet-openstack-cloud
Code Issues Proposed changes

telemetry: honour region name

Browse Source 
Close bug #219

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-11 16:18:03 +01:00
parent 19031869bd
commit 8dd38bdcc3
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/telemetry.pp
View File

@ -64,6 +64,11 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults value in params
# #
# [*region*]
# (optional) the keystone region of this node
# Defaults value in params
#
class cloud::telemetry( class cloud::telemetry(
$ceilometer_secret = $os_params::ceilometer_secret, $ceilometer_secret = $os_params::ceilometer_secret,
$rabbit_hosts = $os_params::rabbit_hosts, $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_port = $os_params::ks_keystone_internal_port,
$ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto,
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_password = $os_params::ks_ceilometer_password,
$region = $os_params::region,
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug, $debug = $os_params::debug,
$log_facility = $os_params::log_facility, $log_facility = $os_params::log_facility,
@ -92,6 +98,7 @@ class cloud::telemetry(
class { 'ceilometer::agent::auth': class { 'ceilometer::agent::auth':
auth_url => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0", auth_url => "${ks_keystone_internal_proto}://${ks_keystone_internal_host}:${ks_keystone_internal_port}/v2.0",
auth_password => $ks_ceilometer_password, auth_password => $ks_ceilometer_password,
auth_region => $region
} }
} }

4
spec/classes/cloud_telemetry_centralagent_spec.rb
View File

@ -31,6 +31,7 @@ describe 'cloud::telemetry::centralagent' do
ks_keystone_internal_port => '5000', ks_keystone_internal_port => '5000',
ks_keystone_internal_proto => 'http', ks_keystone_internal_proto => 'http',
ks_ceilometer_password => 'secrete', ks_ceilometer_password => 'secrete',
region => 'MyRegion',
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
use_syslog => true, use_syslog => true,
verbose => true, verbose => true,
@ -54,7 +55,8 @@ describe 'cloud::telemetry::centralagent' do
) )
should contain_class('ceilometer::agent::auth').with( should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete', :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 end

4
spec/classes/cloud_telemetry_server_spec.rb
View File

@ -31,6 +31,7 @@ describe 'cloud::telemetry::server' do
ks_keystone_internal_port => '5000', ks_keystone_internal_port => '5000',
ks_keystone_internal_proto => 'http', ks_keystone_internal_proto => 'http',
ks_ceilometer_password => 'secrete', ks_ceilometer_password => 'secrete',
region => 'MyRegion',
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
use_syslog => true, use_syslog => true,
verbose => true, verbose => true,
@ -59,7 +60,8 @@ describe 'cloud::telemetry::server' do
) )
should contain_class('ceilometer::agent::auth').with( should contain_class('ceilometer::agent::auth').with(
:auth_password => 'secrete', :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 end