openstack/devstack
Code Issues Proposed changes

detect failure of 'keystone token-get'

Browse Source 
When 'keystone token-get' fails, the caller can't detect the failure.
This cause troulbe shooting a bit complicated.

Change-Id: I3c58c5fd0e92a87e87546ea797904e08646a1097
Closes-Bug: #1238412
This commit is contained in:
DennyZhang 2013-10-11 00:08:29 -05:00
parent 67f7da2de2
commit acb52e5db6
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exercises/neutron-adv-test.sh
View File

@ -102,6 +102,7 @@ KEYSTONE="keystone"
# and save it. # and save it.
TOKEN=`keystone token-get | grep ' id ' | awk '{print $4}'` TOKEN=`keystone token-get | grep ' id ' | awk '{print $4}'`
die_if_not_set $LINENO TOKEN "Keystone fail to get token"
# Various functions # Various functions
# ----------------- # -----------------

1
stack.sh
View File

@ -1203,6 +1203,7 @@ fi
if is_service_enabled g-reg; then if is_service_enabled g-reg; then
TOKEN=$(keystone token-get | grep ' id ' | get_field 2) TOKEN=$(keystone token-get | grep ' id ' | get_field 2)
die_if_not_set $LINENO TOKEN "Keystone fail to get token"
if is_baremetal; then if is_baremetal; then
echo_summary "Creating and uploading baremetal images" echo_summary "Creating and uploading baremetal images"

1
tools/upload_image.sh
View File

@ -33,6 +33,7 @@ fi
# Get a token to authenticate to glance # Get a token to authenticate to glance
TOKEN=$(keystone token-get | grep ' id ' | get_field 2) TOKEN=$(keystone token-get | grep ' id ' | get_field 2)
die_if_not_set $LINENO TOKEN "Keystone fail to get token"
# Glance connection info. Note the port must be specified. # Glance connection info. Note the port must be specified.
GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$GLANCE_HOST:9292} GLANCE_HOSTPORT=${GLANCE_HOSTPORT:-$GLANCE_HOST:9292}