From 1fa87a383678092d681fc102c263232169dba80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <fcharlier@ploup.net>
Date: Fri, 14 Dec 2012 11:12:13 +0100
Subject: [PATCH] Ensure the ceilometer user has ResellerAdmin role
Required to poll swift usage
---
manifests/keystone/auth.pp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 9ef86edb..9b7c61a8 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -37,9 +37,15 @@ class ceilometer::keystone::auth(
email => $email,
tenant => $tenant,
}
+ if !defined(Keystone_role['ResellerAdmin']) {
+ keystone_role { 'ResellerAdmin':
+ ensure => present,
+ }
+ }
keystone_user_role { "${auth_name}@${tenant}":
ensure => present,
- roles => 'admin',
+ roles => ['admin', 'ResellerAdmin'],
+ require => Keystone_role['ResellerAdmin'],
}
keystone_service { $auth_name:
ensure => present,