From: François Charlier <fcharlier@ploup.net>
Date: Fri, 14 Dec 2012 10:12:13 +0000 (+0100)
Subject: Ensure the ceilometer user has ResellerAdmin role
X-Git-Tag: grizzly-eol~39
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1fa87a383678092d681fc102c263232169dba80e;p=puppet-modules%2Fpuppet-ceilometer.git

Ensure the ceilometer user has ResellerAdmin role

Required to poll swift usage
---

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 9ef86ed..9b7c61a 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,