Merge "Add parameters for setting up keystone keys/certs"

1 files changed, 24 insertions, 0 deletions

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index e3a440f9..5e28ac0f 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -244,6 +244,26 @@ Parameters:
     Default: []
     Description: Should be used for arbitrary ips.
     Type: Json
+  KeystoneCACertificate:
+    Default: ''
+    Description: Keystone self-signed certificate authority certificate.
+    Type: String
+    NoEcho: true
+  KeystoneCAKey:
+    Default: ''
+    Description: Keystone certificate authority key.
+    Type: String
+    NoEcho: true
+  KeystoneSigningCertificate:
+    Default: ''
+    Description: Keystone certificate for verifying token validity.
+    Type: String
+    NoEcho: true
+  KeystoneSigningKey:
+    Default: ''
+    Description: Keystone key for signing tokens.
+    Type: String
+    NoEcho: true
 Resources:
   ControlVirtualIP:
     Type: OS::Neutron::Port
@@ -418,6 +438,10 @@ Resources:
           db: mysql://keystone:unset@localhost/keystone
           host:
             get_input: controller_host
+          ca_key: {Ref: KeystoneCAKey}
+          ca_certificate: {Ref: KeystoneCACertificate}
+          signing_key: {Ref: KeystoneSigningKey}
+          signing_certificate: {Ref: KeystoneSigningCertificate}
         mysql:
           innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
         neutron: