summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-11 18:41:08 +0000
committerGerrit Code Review <review@openstack.org>2017-05-11 18:41:08 +0000
commit1e5e74566a424a9a8cedf2721923389409e4b52b (patch)
treee0b01a003bd33bed6330ad0d8332f5c0a32989b5 /puppet
parent5ec18e657852ba366bb0467425434da0821ecf82 (diff)
parenteb923b0fae8eef49b8b2abf19e3035c20c4138dc (diff)
Merge "Disabling replacing fernet keys from puppet"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/keystone.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 58b2b7bf..c42b0530 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -231,6 +231,7 @@ outputs:
content: {get_param: KeystoneFernetKey0}
'/etc/keystone/fernet-keys/1':
content: {get_param: KeystoneFernetKey1}
+ keystone::fernet_replace_keys: false
keystone::debug: {get_param: Debug}
keystone::rabbit_userid: {get_param: RabbitUserName}
keystone::rabbit_password: {get_param: RabbitPassword}