diff options
author | 2016-09-12 21:52:55 +0000 | |
---|---|---|
committer | 2016-09-12 21:52:55 +0000 | |
commit | 5281bfbac8df02d0993656b747f03c5da5d1381f (patch) | |
tree | 74f8160365911cba4198596ed53a7779764b10b0 /puppet | |
parent | 26b56d0e9a76b00b4c87fe394dbdf54fd6a8d3b5 (diff) | |
parent | 8ce3d646a6d76f9449509456ad0f1e0964b9fe8d (diff) |
Merge "Configure Keystone credentials"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/services/keystone.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 79033047..b321ecbe 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -87,6 +87,12 @@ parameters: MonitoringSubscriptionKeystone: default: 'overcloud-kestone' type: string + KeystoneCredential0: + type: string + description: The first Keystone credential key. Must be a valid key. + KeystoneCredential1: + type: string + description: The second Keystone credential key. Must be a valid key. resources: @@ -121,6 +127,12 @@ outputs: keystone_ssl_certificate: {get_param: KeystoneSSLCertificate} keystone_ssl_certificate_key: {get_param: KeystoneSSLCertificateKey} keystone::enable_proxy_headers_parsing: true + keystone::enable_credential_setup: true + keystone::credential_keys: + '/etc/keystone/credential-keys/0': + content: {get_param: KeystoneCredential0} + '/etc/keystone/credential-keys/1': + content: {get_param: KeystoneCredential1} keystone::debug: {get_param: Debug} keystone::db::mysql::password: {get_param: AdminToken} keystone::rabbit_userid: {get_param: RabbitUserName} |