Merge "Fix service_available opt registration and extra comma"

This commit is contained in:
Jenkins 2016-04-18 13:19:31 +00:00 committed by Gerrit Code Review
commit 917badeaff
2 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@ from oslo_config import cfg
service_option = cfg.BoolOpt('zaqar', service_option = cfg.BoolOpt('zaqar',
default=True, default=True,
help="Whether or not Zaqar is expected to be " help="Whether or not Zaqar is expected to be "
"available"), "available")
messaging_group = cfg.OptGroup(name='messaging', messaging_group = cfg.OptGroup(name='messaging',
title='Messaging Service') title='Messaging Service')

View File

@ -35,7 +35,7 @@ class ZaqarTempestPlugin(plugins.TempestPlugin):
def register_opts(self, conf): def register_opts(self, conf):
conf.register_group(zaqar_config.messaging_group) conf.register_group(zaqar_config.messaging_group)
conf.register_opts(zaqar_config.MessagingGroup, group='messaging') conf.register_opts(zaqar_config.MessagingGroup, group='messaging')
conf.register_opts(zaqar_config.service_option, conf.register_opt(zaqar_config.service_option,
group='service_available') group='service_available')
def get_opt_lists(self): def get_opt_lists(self):