Isolate creating service users
The code for creating service users is almost exactly the same. Abstract
this into a function that can be reused and standardized.
Change-Id: I3a4edbff0a928da7ef9b0097a5a8d508fdfab7ff
diff --git a/lib/trove b/lib/trove
index 5e6b1b3..d32c776 100644
--- a/lib/trove
+++ b/lib/trove
@@ -79,13 +79,9 @@
# service trove admin # if enabled
function create_trove_accounts {
- local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
- local service_role=$(openstack role list | awk "/ admin / { print \$2 }")
-
if [[ "$ENABLED_SERVICES" =~ "trove" ]]; then
- local trove_user=$(get_or_create_user "trove" "$SERVICE_PASSWORD")
- get_or_add_user_role $service_role $trove_user $service_tenant
+ create_service_user "trove" "admin"
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then