From 7f1d3be62e096bbcd9e72615d285f0e35d4296aa Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Thu, 17 Jan 2019 19:16:17 -0600 Subject: [PATCH] HTK: dont set keystone password on user creation This PS updates the Keystone user job script to not set the user password upon potential creation, falling back to the set password command later in the script. This is both slighly cleaner, and avoids potential race conditions when running multiple keystone servers. Change-Id: Ibe775df23fe7b747aea5137ca85975e067b8cea3 Signed-off-by: Pete Birley --- helm-toolkit/templates/scripts/_ks-user.sh.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl index 2ede013c9..c2d900cfe 100644 --- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl +++ b/helm-toolkit/templates/scripts/_ks-user.sh.tpl @@ -66,10 +66,9 @@ USER_ID=$(openstack user create --or-show --enable -f value -c id \ --project-domain="${PROJECT_DOMAIN_ID}" \ --project="${USER_PROJECT_ID}" \ --description="${USER_DESC}" \ - --password="${SERVICE_OS_PASSWORD}" \ "${SERVICE_OS_USERNAME}"); -# Manage user password (we do this to ensure the password is updated if required) +# Manage user password (we do this in a seperate step to ensure the password is updated if required) openstack user set --password="${SERVICE_OS_PASSWORD}" "${USER_ID}" # Display user