openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Default NodeTLSData to always attempt setting TLS cert"

Browse Source
This commit is contained in:
Zuul 2018-04-09 23:06:40 +00:00 committed by Gerrit Code Review
commit 8e6bde2e80
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