commit 41c4c9a3e8f175135e709f843c2d96ff4a9daa1f
author Jenkins <jenkins@review.openstack.org> Sat Jan 16 01:11:11 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jan 16 01:11:12 2016 +0000
tree c0a1a2d6c21d4733b7fbfc5dc6bc076bc30d8488
parent 3dc5c7295d7c9f466c2a2ae3ce442cc010bec5c5
parent 5d5e20a2ee4644b31207027cbe0c02d07bf11b5d

Merge "Mark amazon image file config options deprecated"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 92123b9..6942172 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1046,7 +1046,8 @@
     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 @@
                 '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,