openstack/devstack
Code Issues Proposed changes

Fix keystone_data.sh to match default_catalog.templates

Browse Source 
Endpoint creating in keystone_data.sh tends to drift because
KEYSTONE_CATALOG_BACKEND=sql is not the default.

This patch should bring them closer together, and fix a problem I was having
with keystone auth

Change-Id: Ifac57b8e69234975d1ff65ace72d46d3a5808119
This commit is contained in:
Steve Baker 2012-09-11 10:05:14 +12:00
parent d81a0274aa
commit 8d6c9bcabb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/keystone_data.sh
View File

@ -101,7 +101,7 @@ if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
--service_id $KEYSTONE_SERVICE \
--publicurl "http://$SERVICE_HOST:\$(public_port)s/v2.0" \
--adminurl "http://$SERVICE_HOST:\$(admin_port)s/v2.0" \
--internalurl "http://$SERVICE_HOST:\$(admin_port)s/v2.0"
--internalurl "http://$SERVICE_HOST:\$(public_port)s/v2.0"
fi
# Nova
@ -123,9 +123,9 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
keystone endpoint-create \
--region RegionOne \
--service_id $NOVA_SERVICE \
--publicurl "http://$SERVICE_HOST:\$(compute_port)s/v1.1/\$(tenant_id)s" \
--adminurl "http://$SERVICE_HOST:\$(compute_port)s/v1.1/\$(tenant_id)s" \
--internalurl "http://$SERVICE_HOST:\$(compute_port)s/v1.1/\$(tenant_id)s"
--publicurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s" \
--adminurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s" \
--internalurl "http://$SERVICE_HOST:\$(compute_port)s/v2/\$(tenant_id)s"
fi
# Nova needs ResellerAdmin role to download images when accessing
# swift through the s3 api. The admin role in swift allows a user
@ -197,9 +197,9 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
keystone endpoint-create \
--region RegionOne \
--service_id $GLANCE_SERVICE \
--publicurl "http://$SERVICE_HOST:9292/v1" \
--adminurl "http://$SERVICE_HOST:9292/v1" \
--internalurl "http://$SERVICE_HOST:9292/v1"
--publicurl "http://$SERVICE_HOST:9292" \
--adminurl "http://$SERVICE_HOST:9292" \
--internalurl "http://$SERVICE_HOST:9292"
fi
fi
@ -223,7 +223,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
--region RegionOne \
--service_id $SWIFT_SERVICE \
--publicurl "http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s" \
--adminurl "http://$SERVICE_HOST:8080/v1" \
--adminurl "http://$SERVICE_HOST:8080" \
--internalurl "http://$SERVICE_HOST:8080/v1/AUTH_\$(tenant_id)s"
fi
fi