Drop ResellerAdmin role from ceilometer user

The ResellerAdmin role is no longer required because ceilometer doesn't
comminucate with Swift directly but only via Gnocchi.

Change-Id: I8111890a588b84f18ff34bc85794963b905cb844

manifests/keystone/auth.pp

@@ -125,16 +125,5 @@ class ceilometer::keystone::auth (
     password            => $password,
     email               => $email,
     tenant              => $tenant,
-    roles               => ['admin', 'ResellerAdmin'],
-  }
-
-  if $configure_user_role {
-    if !defined(Keystone_role['ResellerAdmin']) {
-      keystone_role { 'ResellerAdmin':
-        ensure => present,
   }
 }
-    Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"]
-  }
-
-}

releasenotes/notes/reseller-admin-45b1cad10ec19b99.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``ResellerAdmin`` role is no longer assigned to the ceilometer user
+    in Keystone.

spec/classes/ceilometer_keystone_auth_spec.rb

@@ -33,7 +33,6 @@ describe 'ceilometer::keystone::auth' do
       it 'configures ceilometer user roles' do
         is_expected.to contain_keystone_user_role("#{default_params[:auth_name]}@#{default_params[:tenant]}").with(
           :ensure => 'present',
-          :roles   => ['admin','ResellerAdmin']
         )
       end
     end
@@ -60,7 +59,6 @@ describe 'ceilometer::keystone::auth' do
       it 'configures ceilometer user roles' do
         is_expected.to contain_keystone_user_role("#{params[:auth_name]}@#{params[:tenant]}").with(
           :ensure => 'present',
-          :roles   => ['admin','ResellerAdmin']
         )
       end
     end