Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add update yaml backward compatibe with PublicVirtualIP on ctlplane"
[apex-tripleo-heat-templates.git]
/
puppet
/
extraconfig
/
tls
/
tls-cert-inject.yaml
diff --git
a/puppet/extraconfig/tls/tls-cert-inject.yaml
b/puppet/extraconfig/tls/tls-cert-inject.yaml
index
739a51a
..
20bb373
100644
(file)
--- 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:
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
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:
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
description: >
The content of the SSL Key in PEM format.
type: string
@@
-53,7
+51,7
@@
resources:
- name: key_modulus
config: |
#!/bin/sh
- 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}
${cert_chain_content}
EOF
chmod 0440 ${cert_path}
@@
-69,6
+67,7
@@
resources:
ControllerTLSDeployment:
type: OS::Heat::SoftwareDeployment
properties:
ControllerTLSDeployment:
type: OS::Heat::SoftwareDeployment
properties:
+ name: ControllerTLSDeployment
config: {get_resource: ControllerTLSConfig}
server: {get_param: server}
input_values:
config: {get_resource: ControllerTLSConfig}
server: {get_param: server}
input_values: