Merge "Set ssl cert option for horizon service"
This commit is contained in:
commit
84e406d530
@ -21,7 +21,7 @@ from six.moves import urllib
|
|||||||
from config_tempest import constants as C
|
from config_tempest import constants as C
|
||||||
|
|
||||||
|
|
||||||
def configure_horizon(conf):
|
def configure_horizon(conf, **kwargs):
|
||||||
"""Derive the horizon URIs from the identity's URI."""
|
"""Derive the horizon URIs from the identity's URI."""
|
||||||
uri = conf.get('identity', 'uri')
|
uri = conf.get('identity', 'uri')
|
||||||
u = urllib.parse.urlparse(uri)
|
u = urllib.parse.urlparse(uri)
|
||||||
@ -41,3 +41,5 @@ def configure_horizon(conf):
|
|||||||
if has_horizon:
|
if has_horizon:
|
||||||
conf.set('dashboard', 'dashboard_url', base + '/')
|
conf.set('dashboard', 'dashboard_url', base + '/')
|
||||||
conf.set('dashboard', 'login_url', base + '/auth/login/')
|
conf.set('dashboard', 'login_url', base + '/auth/login/')
|
||||||
|
ssl = kwargs.get('disable_ssl_certificate_validation', False)
|
||||||
|
conf.set('dashboard', 'disable_ssl_certificate_validation', str(ssl))
|
||||||
|
@ -243,7 +243,10 @@ class Services(object):
|
|||||||
for s in self._services:
|
for s in self._services:
|
||||||
s.post_configuration(self._conf, self.is_service)
|
s.post_configuration(self._conf, self.is_service)
|
||||||
|
|
||||||
horizon.configure_horizon(self._conf)
|
horizon_kwargs = {
|
||||||
|
"disable_ssl_certificate_validation": self._ssl_validation
|
||||||
|
}
|
||||||
|
horizon.configure_horizon(self._conf, **horizon_kwargs)
|
||||||
|
|
||||||
def set_supported_api_versions(self):
|
def set_supported_api_versions(self):
|
||||||
# set supported API versions for services with more of them
|
# set supported API versions for services with more of them
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
discover-tempest-config can now automatically set
|
||||||
|
``CONF.dashboard.disable_ssl_certificate_validation`` option
|
||||||
|
for horizon service.
|
Loading…
Reference in New Issue
Block a user