summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-23 15:27:38 +0000
committerGerrit Code Review <review@openstack.org>2016-11-23 15:27:38 +0000
commit145961271715bc16e65072a5092ddba54694efa5 (patch)
tree21069fc1e7a79fdfd7b2955e7d2668694382d056 /puppet
parentfd870e423daa99bf52d4c36f444c9e4e23c78f3c (diff)
parentf9b2a2207269dd571db40664d71a8b56637b593c (diff)
Merge "Configure Keystone Fernet Keys"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/keystone.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index d819e043..fe023a6a 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -99,6 +99,12 @@ parameters:
KeystoneCredential1:
type: string
description: The second Keystone credential key. Must be a valid key.
+ KeystoneFernetKey0:
+ type: string
+ description: The first Keystone fernet key. Must be a valid key.
+ KeystoneFernetKey1:
+ type: string
+ description: The second Keystone fernet key. Must be a valid key.
KeystoneLoggingSource:
type: json
default:
@@ -156,6 +162,11 @@ outputs:
content: {get_param: KeystoneCredential0}
'/etc/keystone/credential-keys/1':
content: {get_param: KeystoneCredential1}
+ keystone::fernet_keys:
+ '/etc/keystone/fernet-keys/0':
+ content: {get_param: KeystoneFernetKey0}
+ '/etc/keystone/fernet-keys/1':
+ content: {get_param: KeystoneFernetKey1}
keystone::debug: {get_param: Debug}
keystone::rabbit_userid: {get_param: RabbitUserName}
keystone::rabbit_password: {get_param: RabbitPassword}