Stop adding ServiceAvailable group option

service available group already exists.Therefore we don't need to
register this group here again.

Change-Id: I7efc357969c71159bcc50f37f8304ee1b3538eb2
Closes-Bug: #1621036
This commit is contained in:
Nishant Kumar 2016-10-03 15:21:03 +05:30
parent a5a353ae93
commit 645b7e0128
2 changed files with 11 additions and 14 deletions

View File

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

View File

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