Merge "Use TLS environment files from environments/ssl/"
This commit is contained in:
commit
156d14e573
@ -122,7 +122,7 @@
|
|||||||
set_fact:
|
set_fact:
|
||||||
ssl_overcloud_args: >-
|
ssl_overcloud_args: >-
|
||||||
-e {{ working_dir }}/enable-tls.yaml
|
-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:
|
when:
|
||||||
- ssl_overcloud|bool
|
- ssl_overcloud|bool
|
||||||
- release not in ['mitaka', 'liberty']
|
- release not in ['mitaka', 'liberty']
|
||||||
@ -152,8 +152,8 @@
|
|||||||
set_fact:
|
set_fact:
|
||||||
tls_everywhere_args: >-
|
tls_everywhere_args: >-
|
||||||
-e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml
|
-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/ssl/enable-internal-tls.yaml
|
||||||
-e {{ overcloud_templates_path }}/environments/tls-everywhere-endpoints-dns.yaml
|
-e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml
|
||||||
when:
|
when:
|
||||||
- enable_tls_everywhere|bool
|
- enable_tls_everywhere|bool
|
||||||
- release not in ['mitaka', 'liberty', 'newton']
|
- release not in ['mitaka', 'liberty', 'newton']
|
||||||
|
@ -74,7 +74,7 @@ def _open_yaml(filename):
|
|||||||
|
|
||||||
|
|
||||||
def create_enable_file(certpem, keypem, source_dir, dest_dir, tht_release):
|
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':
|
if tht_release == 'mitaka':
|
||||||
for key in output_dict["parameter_defaults"]["EndpointMap"]:
|
for key in output_dict["parameter_defaults"]["EndpointMap"]:
|
||||||
|
Loading…
Reference in New Issue
Block a user