Browse code

Remove tempest deprecated img_dir option

Tempest option scenario.img_dir has been deprecated more than 4 years, it's
time to remove it from devstack.
img_file option should contain the full path to the image.
This patch removes setting of img_dir option and makes img_file
one contain the full path of an image.

Change-Id: I71102095f3603915f0bc7d21f2e18c4eac4e95ec
Depends-On: https://review.opendev.org/#/c/710996/
Related-Bug: #1393881

Martin Kopec authored on 2020/03/12 19:03:38
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