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 Ceilometer API and Collector service to roles_data"
[apex-tripleo-heat-templates.git]
/
puppet
/
extraconfig
/
tls
/
ca-inject.yaml
diff --git
a/puppet/extraconfig/tls/ca-inject.yaml
b/puppet/extraconfig/tls/ca-inject.yaml
index
7e34f07
..
11f2769
100644
(file)
--- a/
puppet/extraconfig/tls/ca-inject.yaml
+++ b/
puppet/extraconfig/tls/ca-inject.yaml
@@
-1,10
+1,10
@@
-heat_template_version:
2015-04-30
+heat_template_version:
pike
description: >
This is a template which will inject the trusted anchor.
parameters:
description: >
This is a template which will inject the trusted anchor.
parameters:
- # Can be overriden via parameter_defaults in the environment
+ # Can be overrid
d
en via parameter_defaults in the environment
SSLRootCertificate:
description: >
The content of a CA's SSL certificate file in PEM format.
SSLRootCertificate:
description: >
The content of a CA's SSL certificate file in PEM format.
@@
-45,7
+45,7
@@
resources:
cat > ${cacert_path} << EOF
${cacert_content}
EOF
cat > ${cacert_path} << EOF
${cacert_content}
EOF
- chmod 044
0
${cacert_path}
+ chmod 044
4
${cacert_path}
chown root:root ${cacert_path}
${update_anchor_command}
md5sum ${cacert_path} > ${heat_outputs_path}.root_cert_md5sum
chown root:root ${cacert_path}
${update_anchor_command}
md5sum ${cacert_path} > ${heat_outputs_path}.root_cert_md5sum
@@
-53,6
+53,7
@@
resources:
CADeployment:
type: OS::Heat::SoftwareDeployment
properties:
CADeployment:
type: OS::Heat::SoftwareDeployment
properties:
+ name: CADeployment
config: {get_resource: CAConfig}
server: {get_param: server}
input_values:
config: {get_resource: CAConfig}
server: {get_param: server}
input_values: