diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-30 16:50:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-30 16:50:50 +0000 |
| commit | 7d89ec86bdeac7536171feb09891efb8171c0455 (patch) | |
| tree | 0b6670a0bde4b4bf8b901ab04d1acf5ccb841d45 | |
| parent | 8c39eda54cae72049f06ada726c13cfe115268a9 (diff) | |
| parent | f115403984f6c6cfa15ed10e4d8ea4c167e6e9ca (diff) | |
Merge "ssl: Add support for a CA Certificate"
| -rw-r--r-- | overcloud-source.yaml | 1 | ||||
| -rw-r--r-- | ssl-source.yaml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 9cbc2030..d730996e 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -606,6 +606,7 @@ Resources: input_values: ssl_certificate: {Ref: SSLCertificate} ssl_key: {Ref: SSLKey} + ssl_ca_certificate: {Ref: SSLCACertificate} controller0Passthrough: Type: OS::Heat::StructuredDeployment Properties: diff --git a/ssl-source.yaml b/ssl-source.yaml index c3edbe75..1d6ac246 100644 --- a/ssl-source.yaml +++ b/ssl-source.yaml @@ -10,6 +10,10 @@ Parameters: Description: If set, the contents of an SSL certificate .key file for encrypting SSL endpoints. Type: String NoEcho: true + SSLCACertificate: + Default: '' + Description: If set, the contents of an SSL certificate authority file. + Type: String Resources: SSLConfig: Type: OS::Heat::StructuredConfig @@ -21,6 +25,8 @@ Resources: get_input: ssl_certificate key: get_input: ssl_key + cacert: + get_input: ssl_ca_certificate ports: - name: 'ec2' accept: 13773 |