Merge "Fix barbican service_available check"
This commit is contained in:
commit
1f0f4ef028
|
@ -31,19 +31,6 @@ ServiceAvailableGroup = [
|
|||
"to be available."),
|
||||
]
|
||||
|
||||
# Pull in the service_available for barbican if it is not defined.
|
||||
# If the barbican tempest plugin isn't loaded, this won't load from
|
||||
# tempest.conf.
|
||||
try:
|
||||
if cfg.CONF.service_available.barbican is not None:
|
||||
LOG.info('Barbican service_available state: {}'.format(
|
||||
cfg.CONF.service_available.barbican))
|
||||
except cfg.NoSuchOptError:
|
||||
ServiceAvailableGroup.append(
|
||||
cfg.BoolOpt('barbican', default=False,
|
||||
help="Whether or not the barbican service is expected to "
|
||||
"be available."))
|
||||
|
||||
octavia_group = cfg.OptGroup(name='load_balancer',
|
||||
title='load-balancer service options')
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ class TLSWithBarbicanTest(test_base.LoadBalancerBaseTestWithCompute):
|
|||
if not CONF.validation.run_validation:
|
||||
raise cls.skipException('Traffic tests will not work without '
|
||||
'run_validation enabled.')
|
||||
if not CONF.service_available.barbican:
|
||||
if not getattr(CONF.service_available, 'barbican', False):
|
||||
raise cls.skipException('TLS with Barbican tests require the '
|
||||
'barbican service.')
|
||||
|
||||
|
|
|
@ -370,12 +370,15 @@
|
|||
- openstack/barbican
|
||||
- openstack/diskimage-builder
|
||||
- openstack/python-barbicanclient
|
||||
- openstack/barbican-tempest-plugin
|
||||
vars:
|
||||
tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2
|
||||
devstack_services:
|
||||
barbican: true
|
||||
devstack_plugins:
|
||||
barbican: https://git.openstack.org/openstack/barbican.git
|
||||
devstack_localrc:
|
||||
TEMPEST_PLUGINS: '"/opt/stack/octavia-tempest-plugin /opt/stack/barbican-tempest-plugin"'
|
||||
|
||||
# Temporary transitional aliases for gates used in other repos
|
||||
# Remove once octavia has transitioned job names
|
||||
|
|
Loading…
Reference in New Issue