diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-12-05 10:13:36 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-12-05 20:48:33 -0500 |
| commit | 9f7ccef25e7f8dde0b630a817d6acf780bc07a0a (patch) | |
| tree | 601bf5db24c6951ff0bec9a911f5dcf59710e64a /controller.yaml | |
| parent | bf9b176e3512f652cdb6fc091a58a4f845bc9619 (diff) | |
Add missing Keystone params to without-mergepy
This patch adds the missing KeystoneSSLCertificate and
KeystoneSSLCertificateKey to overcloud-without-mergepy.yaml.
These parameters were adding to overcloud-source.yaml
in Icf46132230512a31b6dec3c07164c95b13dd8f73. Due to
the concurrent review window they never made it
into the new overcloud-without-mergepy.yaml
implementation.
Change-Id: I8b1155ca0a28392e5d5ade57d53bf810d8b5f053
Diffstat (limited to 'controller.yaml')
| -rw-r--r-- | controller.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index b32996c6..dddc82ce 100644 --- a/controller.yaml +++ b/controller.yaml @@ -158,6 +158,15 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true + KeystoneSSLCertificate: + default: '' + description: Keystone certificate for verifying token validity. + type: string + KeystoneSSLCertificateKey: + default: '' + description: Keystone key for signing tokens. + type: string + hidden: true MysqlClusterUniquePart: description: A unique identifier of the MySQL cluster the controller is in. type: string @@ -426,6 +435,9 @@ resources: ca_certificate: {get_param: KeystoneCACertificate} signing_key: {get_param: KeystoneSigningKey} signing_certificate: {get_param: KeystoneSigningCertificate} + ssl: + certificate: {get_param: KeystoneSSLCertificate} + certificate_key: {get_param: KeystoneSSLCertificateKey} mysql: innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize} local_bind: true |