From 729546a1adfa10c8591e834cc85004d977e1c3dd Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Thu, 12 Mar 2020 10:03:38 +0000 Subject: [PATCH] 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 --- lib/tempest | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tempest b/lib/tempest index 05fcb1f1f3..0d6bdc9dbc 100644 --- a/lib/tempest +++ b/lib/tempest @@ -433,8 +433,7 @@ function configure_tempest { 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