openstack/ironic
Code Issues Proposed changes

Set env variables when all needed files are source

Browse Source 
This patch moves 'source ..openrc admin admin' after we sourced keystone
variables.

Closes-Bug: #1684797

Change-Id: Ic3477c768373c993087d5c6a90dbd7131b4f9f50
This commit is contained in:
Vasyl Saienko 2017-04-20 09:49:25 +03:00
parent 350d8dec39
commit 716e22b712
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/upgrade/upgrade.sh
View File

@ -26,8 +26,6 @@ RUN_DIR=$(cd $(dirname "$0") && pwd)
# Source params # Source params
source $GRENADE_DIR/grenaderc source $GRENADE_DIR/grenaderc
source $TOP_DIR/openrc admin admin
# Import common functions # Import common functions
source $GRENADE_DIR/functions source $GRENADE_DIR/functions
@ -46,6 +44,8 @@ source $TARGET_DEVSTACK_DIR/lib/neutron-legacy
source $TARGET_DEVSTACK_DIR/lib/apache source $TARGET_DEVSTACK_DIR/lib/apache
source $TARGET_DEVSTACK_DIR/lib/keystone source $TARGET_DEVSTACK_DIR/lib/keystone
source $TOP_DIR/openrc admin admin
# Keep track of the DevStack directory # Keep track of the DevStack directory
IRONIC_DEVSTACK_DIR=$(dirname "$0")/.. IRONIC_DEVSTACK_DIR=$(dirname "$0")/..
source $IRONIC_DEVSTACK_DIR/lib/ironic source $IRONIC_DEVSTACK_DIR/lib/ironic