From 6f9f579b04fc095551649c6e2146957c72eed974 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Thu, 12 Mar 2020 12:04:54 -0500
Subject: [PATCH] Modify ks-user member role creation

This change reverts the member role handling to pre-refactor for
the htk ks-user.sh script.

Change-Id: I5d239be3e14d8b1ea428cae9c0014eb92202932b
---
 helm-toolkit/templates/scripts/_ks-user.sh.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
index 9995fc628..1fa1c6a80 100644
--- 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 }}