Merge "Modify ks-user member role creation"

2020-03-13 15:20:19 +00:00 · 2020-03-13 15:20:19 +00:00 · 7c77bc8f4c
commit 7c77bc8f4c
parent e0e9e623a3 6f9f579b04
1 changed files with 4 additions and 2 deletions
--- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl
+++ b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
@ -98,7 +98,9 @@ for SERVICE_OS_ROLE in ${SERVICE_OS_ROLES}; do
  ks_assign_user_role
 done

-# Manage member role for keystone pre-rocky
-SERVICE_OS_ROLE="member"
+# Manage user member role
+: ${MEMBER_OS_ROLE:="member"}
+export USER_ROLE_ID=$(openstack role create --or-show -f value -c id \
+    "${MEMBER_OS_ROLE}");
 ks_assign_user_role
 {{- end }}