From 2ccb4b3c0e27e430b98d0e4a8a27f6bbad08f43c Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Tue, 30 Jun 2015 22:00:31 +0100 Subject: [PATCH] DevStack: Keystone V3 User Creation DevStack is moving to Keystone V3 for various KS related tasks, and the API for several methods is changing. Change-Id: I2c7f31355491a272abef901f43e9ffdddf371250 Depends-On: I6ef50fd384d423bc0f13ee1016a8bdbb0650ecd9 --- contrib/devstack/lib/designate | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate index f5e2f0ccc..70709cc68 100644 --- a/contrib/devstack/lib/designate +++ b/contrib/devstack/lib/designate @@ -210,13 +210,8 @@ function configure_designate { # ------------------------------------------------------------------ # service designate admin # if enabled function create_designate_accounts { - local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") - local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") - - if [[ "$ENABLED_SERVICES" =~ "designate-api" ]]; then - local designate_user=$(get_or_create_user "designate" \ - "$SERVICE_PASSWORD" $service_tenant) - get_or_add_user_project_role $admin_role $designate_user $service_tenant + if is_service_enabled designate-api; then + create_service_user "designate" if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then local designate_service=$(get_or_create_service "designate" \