Merge "ssl: Add support for a CA Certificate"
This commit is contained in:
commit
7d89ec86bd
|
@ -606,6 +606,7 @@ Resources:
|
||||||
input_values:
|
input_values:
|
||||||
ssl_certificate: {Ref: SSLCertificate}
|
ssl_certificate: {Ref: SSLCertificate}
|
||||||
ssl_key: {Ref: SSLKey}
|
ssl_key: {Ref: SSLKey}
|
||||||
|
ssl_ca_certificate: {Ref: SSLCACertificate}
|
||||||
controller0Passthrough:
|
controller0Passthrough:
|
||||||
Type: OS::Heat::StructuredDeployment
|
Type: OS::Heat::StructuredDeployment
|
||||||
Properties:
|
Properties:
|
||||||
|
|
|
@ -10,6 +10,10 @@ Parameters:
|
||||||
Description: If set, the contents of an SSL certificate .key file for encrypting SSL endpoints.
|
Description: If set, the contents of an SSL certificate .key file for encrypting SSL endpoints.
|
||||||
Type: String
|
Type: String
|
||||||
NoEcho: true
|
NoEcho: true
|
||||||
|
SSLCACertificate:
|
||||||
|
Default: ''
|
||||||
|
Description: If set, the contents of an SSL certificate authority file.
|
||||||
|
Type: String
|
||||||
Resources:
|
Resources:
|
||||||
SSLConfig:
|
SSLConfig:
|
||||||
Type: OS::Heat::StructuredConfig
|
Type: OS::Heat::StructuredConfig
|
||||||
|
@ -21,6 +25,8 @@ Resources:
|
||||||
get_input: ssl_certificate
|
get_input: ssl_certificate
|
||||||
key:
|
key:
|
||||||
get_input: ssl_key
|
get_input: ssl_key
|
||||||
|
cacert:
|
||||||
|
get_input: ssl_ca_certificate
|
||||||
ports:
|
ports:
|
||||||
- name: 'ec2'
|
- name: 'ec2'
|
||||||
accept: 13773
|
accept: 13773
|
||||||
|
|
Loading…
Reference in New Issue