Merge pull request #1 from ekarlso/master

Add authentication options
This commit is contained in:
François Charlier 2012-12-17 07:10:53 -08:00
commit 08e8040b87
2 changed files with 40 additions and 2 deletions
manifests/agent

@ -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 = '',
$enabled = true,
) {
package { 'ceilometer-agent-central':
@ -23,4 +29,17 @@ 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_password' : value => $auth_password;
'DEFAULT/os_tenant_name' : value => $auth_tenant_name;
}
if ($auth_tenant_id != '') {
ceilometer_config {
'DEFAULT/os_tenant_id' : value => $auth_tenant_id;
}
}
}

@ -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 = '',
$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_password' : value => $auth_password;
'DEFAULT/os_tenant_name' : value => $auth_tenant_name;
}
if ($auth_tenant_id != '') {
ceilometer_config {
'DEFAULT/os_tenant_id' : value => $auth_tenant_id;
}
}
}