openstack/rally
Code Issues Proposed changes

Add import_opt for CONF.benchmark.glance_image_delete_*

Browse Source 
As of I83b46e223e85306b0e54f1d19cbbc7f21489e759,
glance_image_delete_timeout and glance_image_delete_poll_interval
have been moved from rally.plugins.openstack.wrappers.glance to
rally.plugins.openstack.scenarios.glance.utils. So, if a module
using the options doesn't import the glance.utils module, we should
add import_opt for the options. Otherwise NoSuchOptError might be
raised when the options are being used.

Closes-Bug: 1579855
Change-Id: Ia05be0997680e2c91dc5d19bc6e36d70c6b07690
This commit is contained in:
Arata Notsu 2016-05-10 01:27:27 +09:00
parent b549a0c196
commit 8bc64b424e
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rally/plugins/openstack/cleanup/resources.py
View File

@ -30,6 +30,12 @@ from rally.plugins.openstack.wrappers import keystone as keystone_wrapper
from rally.task import utils as task_utils
CONF = cfg.CONF
CONF.import_opt("glance_image_delete_timeout",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
CONF.import_opt("glance_image_delete_poll_interval",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
LOG = logging.getLogger(__name__)

6
rally/plugins/openstack/context/glance/images.py
View File

@ -24,6 +24,12 @@ from rally.task import context
from rally.task import utils
CONF = cfg.CONF
CONF.import_opt("glance_image_delete_timeout",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
CONF.import_opt("glance_image_delete_poll_interval",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
LOG = logging.getLogger(__name__)

6
rally/verification/tempest/config.py
View File

@ -81,6 +81,12 @@ ROLE_OPTS = [
CONF = cfg.CONF
CONF.register_opts(IMAGE_OPTS, "image")
CONF.register_opts(ROLE_OPTS, "role")
CONF.import_opt("glance_image_delete_timeout",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
CONF.import_opt("glance_image_delete_poll_interval",
"rally.plugins.openstack.scenarios.glance.utils",
"benchmark")
def _create_or_get_data_dir():