aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-27 00:11:07 +0000
committerGerrit Code Review <review@openstack.org>2016-09-27 00:11:07 +0000
commitb279c0a38da0d8ae310fd2a23f16077999362d13 (patch)
tree9ee70382eb57a2cabdc8178e9fc2d42cb704fe29 /puppet/services
parent546683fdc91c5f3269d69b781cd667a4ed21a163 (diff)
parenta52a151fb8e932f168d04c88e1f2e0a5b190bf96 (diff)
Merge "Remove double definition of config_settings key in keystone"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/keystone.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index e358930b..b7a807fa 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -118,7 +118,6 @@ outputs:
logging_groups:
- keystone
config_settings:
- config_settings:
map_merge:
- get_attr: [ApacheServiceBase, role_data, config_settings]
- keystone::database_connection: