commit 3e0960d78f040b0d6b593a5e2fa107d8fd26a41a
author Zuul <zuul@review.opendev.org> Mon Jul 06 22:21:41 2020 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jul 06 22:21:42 2020 +0000
tree 3a7a4fa768da15ff9516e379784b04dccbae9285
parent edd867daef6b8da2b3420ac837d2252d72e2dfa7
parent f8dbfd394a826779f3af403fd5316b9d86492802

Merge "Revert "Drop keystone dedicated ports""

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 05fcb1f..0d6bdc9 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -433,8 +433,7 @@
         SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
         SCENARIO_IMAGE_FILE=$DEFAULT_IMAGE_FILE_NAME
     fi
-    iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR
-    iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_FILE
+    iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_DIR/$SCENARIO_IMAGE_FILE
 
     # If using provider networking, use the physical network for validation rather than private
     TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME