openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Fixup overcloud-ssl templates gen for newton and ocata

Browse Source 
Paths to inject-trust-anchor is not valid for newton and ocata.
This commit adds a check to account for the difference
between the old (tht/environments/inject-trust-anchor.yaml) and
new (tht/environments/ssl/inject-trust-anchor.yaml) paths.

Change-Id: Ifa985bdc0d87ef82f6d3fbaad0a23e8932c65322
This commit is contained in:
Luca Miccini 2019-05-22 06:26:36 +02:00
parent d9cf48795f
commit dfe2ff668a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,10 +97,16 @@ def create_enable_file(certpem, keypem, source_dir, dest_dir, tht_release):
yaml.safe_dump(output_dict, stream, default_style='|')
def create_anchor_file(cert_ca_pem, source_dir, dest_dir, enable_tls_overcloud):
output_dict = _open_yaml(
"{}environments/ssl/inject-trust-anchor.yaml".format(source_dir)
)
def create_anchor_file(cert_ca_pem, source_dir, dest_dir, enable_tls_overcloud, tht_release):
if tht_release in ['mitaka', 'newton', 'ocata']:
output_dict = _open_yaml(
"{}environments/inject-trust-anchor.yaml".format(source_dir)
)
else:
output_dict = _open_yaml(
"{}environments/ssl/inject-trust-anchor.yaml".format(source_dir)
)
if enable_tls_overcloud:
ca_map = {"overcloud-ca": {"content": cert_ca_pem}}
@ -154,7 +160,8 @@ def main():
create_anchor_file(cert_ca_pem,
module.params["source_dir"],
module.params["dest_dir"],
module.params["enable_tls_overcloud"])
module.params["enable_tls_overcloud"],
module.params["tht_release"])
module.exit_json(changed=True)