X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fextraconfig%2Ftls%2Ftls-cert-inject.yaml;h=20bb373784a0dde54ba5df79794c4559bce25fe2;hb=fe2133fa8bfface39bdf132b55b692ac349a85e1;hp=739a51adbe16d88079c2f432f3ea73f71434f170;hpb=c643d4bfccb51f234ed03e7d1d61025edd43622a;p=apex-tripleo-heat-templates.git diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml index 739a51ad..20bb3737 100644 --- a/puppet/extraconfig/tls/tls-cert-inject.yaml +++ b/puppet/extraconfig/tls/tls-cert-inject.yaml @@ -7,7 +7,6 @@ description: > parameters: # Can be overriden via parameter_defaults in the environment SSLCertificate: - default: '' description: > The content of the SSL certificate (without Key) in PEM format. type: string @@ -17,7 +16,6 @@ parameters: The content of an SSL intermediate CA certificate in PEM format. type: string SSLKey: - default: '' description: > The content of the SSL Key in PEM format. type: string @@ -53,7 +51,7 @@ resources: - name: key_modulus config: | #!/bin/sh - cat << EOF | tee ${cert_path} > /dev/null + cat > ${cert_path} << EOF ${cert_chain_content} EOF chmod 0440 ${cert_path} @@ -69,6 +67,7 @@ resources: ControllerTLSDeployment: type: OS::Heat::SoftwareDeployment properties: + name: ControllerTLSDeployment config: {get_resource: ControllerTLSConfig} server: {get_param: server} input_values: