openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Fix haproxy and keepalived env paths"

This commit is contained in:
Zuul 2018-03-02 02:13:00 +00:00 committed by Gerrit Code Review
parent 182fab227b b36508052c
commit 9e566b9cfb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/v1/undercloud_config.py
View File

@ -570,9 +570,11 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False):
registry_overwrites.update(
_get_public_tls_resource_registry_overwrites(enable_tls_yaml_path))
deploy_args += [
'-e', endpoint_environment, '-e',
'environments/services-docker/undercloud-haproxy.yaml',
'-e', 'environments/services-docker/undercloud-keepalived.yaml']
'-e', endpoint_environment,
'-e', os.path.join(tht_templates, 'environments/services-docker/'
'undercloud-haproxy.yaml'),
'-e', os.path.join(tht_templates, 'environments/services-docker/'
'undercloud-keepalived.yaml')]
if (CONF.get('generate_service_certificate') or
CONF.get('undercloud_service_certificate')):