diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-19 15:27:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-19 15:27:00 +0000 |
commit | 11a97ec7430118bbf4a11c87eceb3adec40ea4ac (patch) | |
tree | c6334a938c1764969fe2abc8f36ae69d2b6b8e28 /environments/ssl | |
parent | 77eec6867a064e8764745375940cf085be958c2f (diff) | |
parent | 204a5820995dd694fcd58d61fc6cf34a8955da92 (diff) |
Merge "Add nested sample environments for inject-trust-anchor"
Diffstat (limited to 'environments/ssl')
-rw-r--r-- | environments/ssl/inject-trust-anchor-hiera.yaml | 22 | ||||
-rw-r--r-- | environments/ssl/inject-trust-anchor.yaml | 20 |
2 files changed, 42 insertions, 0 deletions
diff --git a/environments/ssl/inject-trust-anchor-hiera.yaml b/environments/ssl/inject-trust-anchor-hiera.yaml new file mode 100644 index 00000000..db3f2677 --- /dev/null +++ b/environments/ssl/inject-trust-anchor-hiera.yaml @@ -0,0 +1,22 @@ +# ******************************************************************* +# This file was created automatically by the sample environment +# generator. Developers should use `tox -e genconfig` to update it. +# Users are recommended to make changes to a copy of the file instead +# of the original, if any customizations are needed. +# ******************************************************************* +# title: Inject SSL Trust Anchor on Overcloud Nodes +# description: | +# When using an SSL certificate signed by a CA that is not in the default +# list of CAs, this environment allows adding a custom CA certificate to +# the overcloud nodes. +parameter_defaults: + # Map containing the CA certs and information needed for deploying them. + # Type: json + CAMap: + first-ca-name: + content: | + The content of the CA cert goes here + second-ca-name: + content: | + The content of the CA cert goes here + diff --git a/environments/ssl/inject-trust-anchor.yaml b/environments/ssl/inject-trust-anchor.yaml new file mode 100644 index 00000000..521a4191 --- /dev/null +++ b/environments/ssl/inject-trust-anchor.yaml @@ -0,0 +1,20 @@ +# ******************************************************************* +# This file was created automatically by the sample environment +# generator. Developers should use `tox -e genconfig` to update it. +# Users are recommended to make changes to a copy of the file instead +# of the original, if any customizations are needed. +# ******************************************************************* +# title: Inject SSL Trust Anchor on Overcloud Nodes +# description: | +# When using an SSL certificate signed by a CA that is not in the default +# list of CAs, this environment allows adding a custom CA certificate to +# the overcloud nodes. +parameter_defaults: + # The content of a CA's SSL certificate file in PEM format. This is evaluated on the client side. + # Mandatory. This parameter must be set by the user. + # Type: string + SSLRootCertificate: | + The contents of your certificate go here + +resource_registry: + OS::TripleO::NodeTLSCAData: ../../puppet/extraconfig/tls/ca-inject.yaml |