From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 26 Sep 2016 11:10:39 +0000 (+0300)
Subject: Remove double definition of config_settings key in keystone
X-Git-Tag: opnfv-6.0.0~1568^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a52a151fb8e932f168d04c88e1f2e0a5b190bf96;p=apex-tripleo-heat-templates.git

Remove double definition of config_settings key in keystone

Change-Id: I291bfb1e5736864ea504cd82eea1d4001fcdd931
---

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
@@ -117,7 +117,6 @@ outputs:
       logging_source: {get_param: KeystoneLoggingSource}
       logging_groups:
         - keystone
-      config_settings:
       config_settings:
         map_merge:
           - get_attr: [ApacheServiceBase, role_data, config_settings]