openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Jenkins 2014-06-11 09:53:31 +00:00 committed by Gerrit Code Review
parent 6dcc9e1528 6a5d5992a5
commit 441b60b43c
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
overcloud-source.yaml
View File

@ -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: