openstack/designate
Code Issues Proposed changes

DevStack: Keystone V3 User Creation

Browse Source 
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
This commit is contained in:
Kiall Mac Innes 2015-06-30 22:00:31 +01:00
parent 1d32c94962
commit 2ccb4b3c0e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/devstack/lib/designate
View File

@ -210,13 +210,8 @@ function configure_designate {
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# service designate admin # if enabled # service designate admin # if enabled
function create_designate_accounts { function create_designate_accounts {
local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") if is_service_enabled designate-api; then
local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") create_service_user "designate"
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 [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
local designate_service=$(get_or_create_service "designate" \ local designate_service=$(get_or_create_service "designate" \