Browse Source

Merge "Drop ResellerAdmin role from ceilometer user"

changes/63/788663/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
f14b826260
3 changed files with 7 additions and 15 deletions
  1. +0
    -11
      manifests/keystone/auth.pp
  2. +5
    -0
      releasenotes/notes/reseller-admin-45b1cad10ec19b99.yaml
  3. +2
    -4
      spec/classes/ceilometer_keystone_auth_spec.rb

+ 0
- 11
manifests/keystone/auth.pp View File

@ -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}"]
}
}

+ 5
- 0
releasenotes/notes/reseller-admin-45b1cad10ec19b99.yaml View File

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

+ 2
- 4
spec/classes/ceilometer_keystone_auth_spec.rb View File

@ -32,8 +32,7 @@ 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']
:ensure => 'present',
)
end
end
@ -59,8 +58,7 @@ 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']
:ensure => 'present',
)
end
end


Loading…
Cancel
Save