openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Default NodeTLSData to always attempt setting TLS cert 

This is part of enabling TLS by default. It'll be needed in order to get
the certificate injection to work.

Needed-By: I3d3cad0eb1396e7bee146794b29badad302efdf3
Change-Id: I25e35ad1e4f12eb4cca7a0cd3e120e70e4a8c564
This commit is contained in:
Juan Antonio Osorio Robles 2018-03-27 13:41:45 +03:00
parent 7414edfee7
commit 1877ef80be
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/ssl/enable-tls.yaml
View File

@ -20,7 +20,6 @@ parameter_defaults:
SSLIntermediateCertificate: ''
# The content of the SSL Key in PEM format.
# Mandatory. This parameter must be set by the user.
# Type: string
SSLKey: |
The contents of the private key go here

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -51,7 +51,7 @@ resource_registry:
OS::TripleO::{{role.name}}::NodeUserData: firstboot/userdata_default.yaml
{% endfor %}
OS::TripleO::NodeTLSCAData: OS::Heat::None
OS::TripleO::NodeTLSData: OS::Heat::None
OS::TripleO::NodeTLSData: puppet/extraconfig/tls/tls-cert-inject.yaml
OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml

3
puppet/extraconfig/tls/tls-cert-inject.yaml
View File

@ -16,7 +16,10 @@ parameters:
description: >
The content of an SSL intermediate CA certificate in PEM format.
type: string
# NOTE(jaosorior): Adding this default is only while we enable TLS by default
# for the overcloud. It'll be removed in a subsequent patch.
SSLKey:
default: ''
description: >
The content of the SSL Key in PEM format.
type: string