From 604c02e676d1ea7f28631c9a64b6f83c0338f741 Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Mon, 17 Dec 2012 02:33:38 +0100 Subject: [PATCH] Add authentication config opts --- manifests/agent/central.pp | 20 +++++++++++++++++++- manifests/agent/compute.pp | 21 ++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp index 510f09d..d1042eb 100644 --- a/manifests/agent/central.pp +++ b/manifests/agent/central.pp @@ -2,7 +2,13 @@ # # class ceilometer::agent::central( - $enabled = true, + $auth_url = 'http://localhost:5000/v2.0', + $auth_region = 'RegionOne', + $auth_user = 'ceilometer', + $auth_password = 'password', + $auth_tenant_name = 'service', + $auth_tenant_id = null, + $enabled = true, ) { package { 'ceilometer-agent-central': @@ -23,4 +29,16 @@ class ceilometer::agent::central( require => Package['ceilometer-agent-central'] } + ceilometer_config { + 'DEFAULT/os_auth_url' : value => $auth_url; + 'DEFAULT/os_auth_region' : value => $auth_region; + 'DEFAULT/os_username' : value => $auth_username; + 'DEFAULT/os_tenant_name' : value => $auth_tenant_name; + } + + 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 dff5d98..e276172 100644 --- a/manifests/agent/compute.pp +++ b/manifests/agent/compute.pp @@ -2,7 +2,13 @@ # # class ceilometer::agent::compute( - $enabled = true, + $auth_url = 'http://localhost:5000/v2.0', + $auth_region = 'RegionOne', + $auth_user = 'ceilometer', + $auth_password = 'password', + $auth_tenant_name = 'service', + $auth_tenant_id = null, + $enabled = true, ) { package { 'ceilometer-agent-compute': @@ -23,4 +29,17 @@ class ceilometer::agent::compute( require => Package['ceilometer-agent-compute'] } + ceilometer_config { + 'DEFAULT/os_auth_url' : value => $auth_url; + 'DEFAULT/os_auth_region' : value => $auth_region; + 'DEFAULT/os_username' : value => $auth_username; + 'DEFAULT/os_tenant_name' : value => $auth_tenant_name; + 'DEFAULT/os_tenant_id' : value => $auth_tenant_id; + } + + if ($auth_tenant_id) { + ceilometer_config { + 'DEFAULT/os_tenant_id' : value => $auth_tenant_id; + } + } } -- 2.45.2