openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Use TLS environment files from environments/ssl/"

This commit is contained in:
Zuul 2018-10-07 16:41:06 +00:00 committed by Gerrit Code Review
parent f256c0110e bf7a2e22df
commit 156d14e573
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/overcloud-deploy/tasks/pre-deploy.yml
View File

@ -122,7 +122,7 @@
set_fact:
ssl_overcloud_args: >-
-e {{ working_dir }}/enable-tls.yaml
-e {{ overcloud_templates_path }}/environments/tls-endpoints-public-ip.yaml
-e {{ overcloud_templates_path }}/environments/ssl/tls-endpoints-public-ip.yaml
when:
- ssl_overcloud|bool
- release not in ['mitaka', 'liberty']
@ -152,8 +152,8 @@
set_fact:
tls_everywhere_args: >-
-e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml
-e {{ overcloud_templates_path }}/environments/enable-internal-tls.yaml
-e {{ overcloud_templates_path }}/environments/tls-everywhere-endpoints-dns.yaml
-e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml
-e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml
when:
- enable_tls_everywhere|bool
- release not in ['mitaka', 'liberty', 'newton']

2
roles/overcloud-ssl/library/tls_tht.py
View File

@ -74,7 +74,7 @@ def _open_yaml(filename):
def create_enable_file(certpem, keypem, source_dir, dest_dir, tht_release):
output_dict = _open_yaml("{}environments/enable-tls.yaml".format(source_dir))
output_dict = _open_yaml("{}environments/ssl/enable-tls.yaml".format(source_dir))
if tht_release == 'mitaka':
for key in output_dict["parameter_defaults"]["EndpointMap"]: