Browse code

Merge "Remove tempest deprecated img_dir option"

Zuul authored on 2020/07/07 05:07:29
Showing 1 changed files
... ...
@@ -433,8 +433,7 @@ function configure_tempest {
433 433
         SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
434 434
         SCENARIO_IMAGE_FILE=$DEFAULT_IMAGE_FILE_NAME
435 435
     fi
436
-    iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR
437
-    iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_FILE
436
+    iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_DIR/$SCENARIO_IMAGE_FILE
438 437
 
439 438
     # If using provider networking, use the physical network for validation rather than private
440 439
     TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME