From 9f7ccef25e7f8dde0b630a817d6acf780bc07a0a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 5 Dec 2014 10:13:36 -0500 Subject: 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 --- controller.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'controller.yaml') 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 -- cgit 1.2.3-korg