From 4a3b5cdc693a3272ba28234dc0585461815b7602 Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Mon, 17 Dec 2012 02:43:31 +0100 Subject: [PATCH] Only bother setting tenant_id if it's passed --- manifests/agent/central.pp | 4 ++-- manifests/agent/compute.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp index d1042eb..b336014 100644 --- a/manifests/agent/central.pp +++ b/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; } diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp index 588aab4..68a6b7e 100644 --- a/manifests/agent/compute.pp +++ b/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; } -- 2.45.2