openstack/devstack
Code Issues Proposed changes

clean up service token

Browse Source
This commit is contained in:
Vishvananda Ishaya 2011-11-06 11:18:26 -08:00
parent 5f03932626
commit 9812ffb998
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/nova-api-paste.ini
View File

@ -124,4 +124,4 @@ auth_host = 127.0.0.1
auth_port = 35357 auth_port = 35357
auth_protocol = http auth_protocol = http
auth_uri = http://127.0.0.1:5000/ auth_uri = http://127.0.0.1:5000/
admin_token = 999888777666 admin_token = %SERVICE_TOKEN%

15
stack.sh
View File

@ -562,15 +562,12 @@ fi
# ---- # ----
if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
# We are going to use the sample http middleware configuration from the # We are going to use a sample http middleware configuration based on the
# keystone project to launch nova. This paste config adds the configuration # one from the keystone project to launch nova. This paste config adds
# required for nova to validate keystone tokens - except we need to switch # the configuration required for nova to validate keystone tokens. We add
# the config to use our service token instead (instead of the invalid token # our own service token to the configuration.
# 999888777666). cp $FILES/nova-api-paste.ini $NOVA_DIR/bin
if [ ! -e $NOVA_DIR/bin/nova-api-paste.ini ]; then sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini
cp $FILES/nova-api-paste.ini $NOVA_DIR/bin
sed -e "s,999888777666,$SERVICE_TOKEN,g" -i $NOVA_DIR/bin/nova-api-paste.ini
fi
fi fi
if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then