From 5d5e20a2ee4644b31207027cbe0c02d07bf11b5d Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 14 Jan 2016 10:54:30 -0500 Subject: [PATCH] Mark amazon image file config options deprecated This commit marks the 4 options used in the scenario section as deprecated. The behavior of these options and the other image file options in the scenario section have a very convoluted and difficult to understand. There is no reason for this complexity we should just have a single option to tell tempest where the image file is. As the first step in cleaning this up this marks the options which will be removed as deprecated to signal to users the future change here. Partial Bug: #1393881 Change-Id: I8a6ee167384c8a2d17905db3a4061c06398980ad --- tempest/config.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tempest/config.py b/tempest/config.py index 92123b9137..69421729b3 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -1046,7 +1046,8 @@ ScenarioGroup = [ cfg.StrOpt('img_dir', default='/opt/stack/new/devstack/files/images/' 'cirros-0.3.1-x86_64-uec', - help='Directory containing image files'), + help='Directory containing image files', + deprecated_for_removal=True), cfg.StrOpt('img_file', deprecated_name='qcow2_img_file', default='cirros-0.3.1-x86_64-disk.img', help='Image file name'), @@ -1060,13 +1061,16 @@ ScenarioGroup = [ 'Use for custom images which require them'), cfg.StrOpt('ami_img_file', default='cirros-0.3.1-x86_64-blank.img', - help='AMI image file name'), + help='AMI image file name', + deprecated_for_removal=True), cfg.StrOpt('ari_img_file', default='cirros-0.3.1-x86_64-initrd', - help='ARI image file name'), + help='ARI image file name', + deprecated_for_removal=True), cfg.StrOpt('aki_img_file', default='cirros-0.3.1-x86_64-vmlinuz', - help='AKI image file name'), + help='AKI image file name', + deprecated_for_removal=True), cfg.IntOpt( 'large_ops_number', default=0,