aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-20 08:40:07 +0000
committerGerrit Code Review <review@openstack.org>2018-09-20 08:40:07 +0000
commit6a0b2ee29aa4b95b6d54aaaa62d01d896c1c3868 (patch)
treed72a9d3615d8ac901e01071c78c78a7bdc8f15eb /docker
parent4c72aedb7620205d97c98d94868f1ce4da252be5 (diff)
parente08da5f9837a91f2b6e0fc2f20877d5cec3aa14f (diff)
downloadkolla-6a0b2ee29aa4b95b6d54aaaa62d01d896c1c3868.tar.gz
kolla-6a0b2ee29aa4b95b6d54aaaa62d01d896c1c3868.zip
Merge "Handle role properly when it is changed in kolla_keystone_user module"
Diffstat (limited to 'docker')
-rw-r--r--docker/kolla-toolbox/kolla_keystone_user.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/kolla-toolbox/kolla_keystone_user.py b/docker/kolla-toolbox/kolla_keystone_user.py
index e6a56f3c2..319cf67c8 100644
--- a/docker/kolla-toolbox/kolla_keystone_user.py
+++ b/docker/kolla-toolbox/kolla_keystone_user.py
@@ -68,6 +68,12 @@ def main():
password=password,
default_project=project,
domain_id='default')
+ role_assignments = cloud.keystone_client.role_assignments
+ assignment = role_assignments.list(user=user,
+ project=project,
+ role=role)
+ if not assignment:
+ changed = True
cloud.grant_role(role,
user=user,
project=project)