openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add SSL PKI properties for keystone"

Browse Source
This commit is contained in:
Jenkins
2014-10-30 09:11:01 +00:00
committed by Gerrit Code Review
parent 309931c3d0 0064f5e8b6
commit b6fac3c901
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overcloud-source.yaml
View File

@@ -173,6 +173,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
LiveUpdateComputeImage:
type: string
description: The image ID for live-updates to the overcloud compute nodes.
@@ -568,6 +577,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

12
undercloud-source.yaml
View File

@@ -115,6 +115,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
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
@@ -291,6 +300,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}
root-password: {get_resource: MysqlRootPassword}