openstack/trove
Code Issues Proposed changes

(fix gate) Don't source openrc in gate run

Browse Source 
The latest set of changes to devstack include one
where enabling a plugin more than once now causes
a fatal error.  Trovestack code sources openrc,
which sources other files that eventually call
enable_plugin on the trove module.  Unfortunately
since trovestack also sources some of the same
files, this causes the error to be triggered.

The fix is to remove the call to openrc and just
set the credentials manually.

Change-Id: Iec71474ccfe757c8384c0b4e4b0758636668aebe
This commit is contained in:
Peter Stachowski 2016-11-30 03:49:08 +00:00
parent 2171640118
commit 6606baf504
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration/scripts/trovestack
View File

@ -824,16 +824,13 @@ function cmd_build_and_upload_image() {
IMAGE_URL="file://$QCOW_IMAGE"
fi
# The devstack openrc has references to 'enable_plugin' which causes errors
# in the stable/juno and stable/kilo branches. These are safe to ignore.
set +e; source $PATH_DEVSTACK_SRC/openrc admin admin; set -e
TOKEN=$(openstack token issue | grep ' id ' | get_field 2)
GLANCE_IMAGEIDS=$(glance image-list | grep $(basename $IMAGE_URL .qcow2) | get_field 1)
local credentials="--os-username=admin --os-password=$ADMIN_PASSWORD --os-tenant-name=admin --os-auth-url=$TROVE_AUTH_ENDPOINT --os-region $REGION_NAME"
TOKEN=$(openstack $credentials token issue | grep ' id ' | get_field 2)
GLANCE_IMAGEIDS=$(glance $credentials image-list | grep $(basename $IMAGE_URL .qcow2) | get_field 1)
if [[ -n $GLANCE_IMAGEIDS ]]; then
glance image-delete $GLANCE_IMAGEIDS
glance $credentials image-delete $GLANCE_IMAGEIDS
fi
GLANCE_IMAGEID=`get_glance_id upload_image $IMAGE_URL $TOKEN`
set +e; source $PATH_DEVSTACK_SRC/openrc demo demo; set -e
[[ -z "$GLANCE_IMAGEID" ]] && echo "Glance upload failed!" && exit 1
echo "IMAGE ID: $GLANCE_IMAGEID"