openstack
/
puppet-monasca
Code Issues Proposed changes

Fix for custom agent roles 

Previously user_roles_agent and user_roles_user were ignored

Change-Id: I5c69bbb4cc57b0dbbdbd3d1c2c4a65c2e0dbae58
This commit is contained in:
Ryan Bak 2016-05-05 13:11:57 -06:00
parent 56976956e2
commit 4cf1d03f9f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/keystone/auth.pp
View File

@ -225,8 +225,7 @@ class monasca::keystone::auth (
if $user_roles_agent {
$real_user_roles_agent = $user_roles_agent
} else {
$real_user_roles_agent = [Keystone_role[$role_agent],
Keystone_role[$role_delegate]]
$real_user_roles_agent = [$role_agent, $role_delegate]
}
if $user_roles_admin {
$real_user_roles_admin = $user_roles_admin
@ -236,20 +235,18 @@ class monasca::keystone::auth (
if $user_roles_user {
$real_user_roles_user = $user_roles_user
} else {
$real_user_roles_user = [Keystone_role[$role_user]]
$real_user_roles_user = [$role_user]
}
keystone_user_role { "${agent_name}@${tenant}":
ensure => present,
roles => [$role_agent, $role_delegate],
require => $real_user_roles_agent,
before => Service['monasca-agent'],
ensure => present,
roles => $real_user_roles_agent,
before => Service['monasca-agent'],
}
keystone_user_role { "${user_name}@${tenant}":
ensure => present,
roles => [$role_user],
require => $real_user_roles_user,
before => Service['monasca-agent'],
ensure => present,
roles => $real_user_roles_user,
before => Service['monasca-agent'],
}
}