openstack/deb-aodh
Code Issues Proposed changes

devstack: support publicURL retrieval in both keystone v2/v3 format

Browse Source 
Recent devstack commit Ia792b23119c00089542ba08879dca1c29dc80945 revert
keystone to use V2 api again, we need to support both v2/v3 output
format.

Change-Id: Ib51769336331872dc33a18097718d1cb54643d5e
Co-Authored-By: Lianhao Lu <lianhao.lu@intel.com>
This commit is contained in:
gordon chung 2016-02-02 08:30:20 -05:00
parent 5201b5eb73
commit 7663c9562b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
aodh/tests/functional/hooks/post_test_hook.sh
View File

@ -36,8 +36,13 @@ if [ -d $BASE/new/devstack ]; then
STACK_USER=stack
sudo chown -R $STACK_USER:stack $AODH_DIR
source $BASE/new/devstack/openrc admin admin
if [ $OS_IDENTITY_API_VERSION == '2.0' ]; then
urltag='publicURL'
else
urltag='public'
fi
openstack catalog list
export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value | awk '/public/{print $2}')
export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value | awk "/$urltag"'/{print $2}')
export AODH_SERVICE_TOKEN=$(openstack token issue -c id -f value)
# Go to the aodh dir
cd $AODH_DIR