]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Ensure the ceilometer user has ResellerAdmin role
authorFrançois Charlier <fcharlier@ploup.net>
Fri, 14 Dec 2012 10:12:13 +0000 (11:12 +0100)
committerFrançois Charlier <fcharlier@ploup.net>
Fri, 14 Dec 2012 10:12:13 +0000 (11:12 +0100)
Required to poll swift usage

manifests/keystone/auth.pp

index 9ef86edb62f3baf188bfd884c31d788118e20044..9b7c61a892a440f43717cfaa8f992e68d056b497 100644 (file)
@@ -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,