diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-06-11 09:53:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-06-11 09:53:31 +0000 |
commit | 441b60b43c5acff0ead6203dc7e28621db363c82 (patch) | |
tree | 490afffc595e4e48f46be419244645f9af186362 | |
parent | 6dcc9e1528b3dff5279cbd17b01579f24db350ae (diff) | |
parent | 6a5d5992a5e46e359e84652973bfff125d04d875 (diff) |
Merge "Add parameters for setting up keystone keys/certs"
-rw-r--r-- | overcloud-source.yaml | 24 |
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: |