Merge "Add parameters for setting up keystone keys/certs"
This commit is contained in:
commit
441b60b43c
|
@ -244,6 +244,26 @@ Parameters:
|
||||||
Default: []
|
Default: []
|
||||||
Description: Should be used for arbitrary ips.
|
Description: Should be used for arbitrary ips.
|
||||||
Type: Json
|
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:
|
Resources:
|
||||||
ControlVirtualIP:
|
ControlVirtualIP:
|
||||||
Type: OS::Neutron::Port
|
Type: OS::Neutron::Port
|
||||||
|
@ -418,6 +438,10 @@ Resources:
|
||||||
db: mysql://keystone:unset@localhost/keystone
|
db: mysql://keystone:unset@localhost/keystone
|
||||||
host:
|
host:
|
||||||
get_input: controller_host
|
get_input: controller_host
|
||||||
|
ca_key: {Ref: KeystoneCAKey}
|
||||||
|
ca_certificate: {Ref: KeystoneCACertificate}
|
||||||
|
signing_key: {Ref: KeystoneSigningKey}
|
||||||
|
signing_certificate: {Ref: KeystoneSigningCertificate}
|
||||||
mysql:
|
mysql:
|
||||||
innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
|
innodb_buffer_pool_size: {Ref: MysqlInnodbBufferPoolSize}
|
||||||
neutron:
|
neutron:
|
||||||
|
|
Loading…
Reference in New Issue