From 4dbe3c2f69ccb3394760c7cb90871180ee414442 Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Wed, 15 Apr 2020 23:08:30 +0000
Subject: [PATCH] Remove deprecated scenario image option

Removing deprecated CONF.scenario.img_dir option as it's beeing removed
from Tempest after ~4 year depreation period [1].

Currently Tempest is throwing a warning if img_dir is still used.
Both behaviors (img_dir and a full pathin img_file) are supported until
Tempest 25.0.0, starting Tempest 26.0.0 a full path in
CONF.scenario.img_file config option will have to be specified.

[1] https://review.opendev.org/#/c/710996/

Related-Bug: #1393881
Change-Id: Ifd02065de88eea1c75825be3178fc9f8d9721a16
---
 tempest_setup/tempest.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tempest_setup/tempest.conf b/tempest_setup/tempest.conf
index 4c3bfed..26020c5 100644
--- a/tempest_setup/tempest.conf
+++ b/tempest_setup/tempest.conf
@@ -68,8 +68,7 @@ instance_type = 1
 lock_path = tempest_lock
 
 [scenario]
-img_dir = images
-img_file = cirros-0.3.4-x86_64-disk.img
+img_file = images/cirros-0.3.4-x86_64-disk.img
 
 [service_available]
 heat-cfn = true