From d6c85065b530286c087c39fa59d27596636022ad Mon Sep 17 00:00:00 2001 From: Atul Moghe Date: Tue, 23 Feb 2016 18:05:50 -0800 Subject: [PATCH] using $OS_REGION_NAME instead of hardcoded RegionOne, got overwritten in previous commit Partial-Bug: #1547784 Change-Id: Iefd864f53d25d872114102e0b47259ef49fe2a24 --- .../openstack/scripts/contrail-keystone-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh b/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh index 1dbe122f..6c288a53 100644 --- a/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh +++ b/contrail_provisioning/openstack/scripts/contrail-keystone-setup.sh @@ -212,12 +212,12 @@ source /etc/contrail/openstackrc if [[ -n "$ENABLE_ENDPOINTS" ]]; then if [ -z $(endpoint_lookup $NOVA_SERVICE) ]; then if [ $ubuntu_liberty -eq 1 ]; then - openstack endpoint create --region RegionOne $NOVA_SERVICE \ + openstack endpoint create --region $OS_REGION_NAME $NOVA_SERVICE \ --publicurl http://$CONTROLLER:8774/v1.1/%\(tenant_id\)s \ --adminurl http://$CONTROLLER:8774/v1.1/%\(tenant_id\)s \ --internalurl http://$CONTROLLER:8774/v1.1/%\(tenant_id\)s else - keystone endpoint-create --region RegionOne --service-id $NOVA_SERVICE \ + keystone endpoint-create --region $OS_REGION_NAME --service-id $NOVA_SERVICE \ --publicurl 'http://'$CONTROLLER':$(compute_port)s/v1.1/$(tenant_id)s' \ --adminurl 'http://'$CONTROLLER:'$(compute_port)s/v1.1/$(tenant_id)s' \ --internalurl 'http://'$CONTROLLER:'$(compute_port)s/v1.1/$(tenant_id)s'