openstack/zun
Code Issues Proposed changes

Merge "Stop adding ServiceAvailable group option"

Browse Source
This commit is contained in:
Jenkins 2016-10-04 17:04:34 +00:00 committed by Gerrit Code Review
commit aa089b1bb4
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zun/tests/tempest/config.py
View File

@ -13,14 +13,10 @@
from oslo_config import cfg from oslo_config import cfg
service_available_group = cfg.OptGroup(name="service_available", service_option = cfg.BoolOpt("zun",
title="Available OpenStack Services") default=True,
help="Whether or not zun is expected to be "
ServiceAvailableGroup = [ "available")
cfg.BoolOpt("zun",
default=True,
help="Whether or not zun is expected to be available"),
]
container_management_group = cfg.OptGroup( container_management_group = cfg.OptGroup(
name="container_management", title="Container Management Service Options") name="container_management", title="Container Management Service Options")

13
zun/tests/tempest/plugin.py
View File

@ -14,7 +14,6 @@
import os import os
from tempest import config
from tempest.test_discover import plugins from tempest.test_discover import plugins
from zun.tests.tempest import config as config_zun from zun.tests.tempest import config as config_zun
@ -30,11 +29,13 @@ class ZunTempestPlugin(plugins.TempestPlugin):
return full_test_dir, base_path return full_test_dir, base_path
def register_opts(self, conf): def register_opts(self, conf):
config.register_opt_group(conf, config_zun.service_available_group, conf.register_opt(config_zun.service_option,
config_zun.ServiceAvailableGroup) group='service_available')
config.register_opt_group(conf, config_zun.container_management_group, conf.register_group(config_zun.container_management_group)
config_zun.ContainerManagementGroup) conf.register_opts(config_zun.ContainerManagementGroup,
group='container_management')
def get_opt_lists(self): def get_opt_lists(self):
return [(config_zun.container_management_group.name, return [(config_zun.container_management_group.name,
config_zun.ContainerManagementGroup)] config_zun.ContainerManagementGroup),
('service_available', [config_zun.service_option])]