openstack/puppet-ceilometer
Code Issues Proposed changes

Only bother setting tenant_id if it's passed

Browse Source
This commit is contained in:
Endre Karlson 2012-12-17 02:43:31 +01:00
parent 0460de348c
commit 4a3b5cdc69
2 changed files with 4 additions and 4 deletions
manifests/agent
central.ppcompute.pp

4
manifests/agent/central.pp

@ -7,7 +7,7 @@ class ceilometer::agent::central(
$auth_user = 'ceilometer',
$auth_password = 'password',
$auth_tenant_name = 'service',
$auth_tenant_id = null,
$auth_tenant_id = '',
$enabled = true,
) {
@ -36,7 +36,7 @@ class ceilometer::agent::central(
'DEFAULT/os_tenant_name' : value => $auth_tenant_name;
}
if ($auth_tenant_id) {
if ($auth_tenant_id != '') {
ceilometer_config {
'DEFAULT/os_tenant_id' : value => $auth_tenant_id;
}

4
manifests/agent/compute.pp

@ -7,7 +7,7 @@ class ceilometer::agent::compute(
$auth_user = 'ceilometer',
$auth_password = 'password',
$auth_tenant_name = 'service',
$auth_tenant_id = null,
$auth_tenant_id = '',
$enabled = true,
) {
@ -36,7 +36,7 @@ class ceilometer::agent::compute(
'DEFAULT/os_tenant_name' : value => $auth_tenant_name;
}
if ($auth_tenant_id) {
if ($auth_tenant_id != '') {
ceilometer_config {
'DEFAULT/os_tenant_id' : value => $auth_tenant_id;
}