summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 14:44:38 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 14:44:38 +0000
commit5dd9748bb0281fb2c3f55d08a61286efbfb1854f (patch)
treef42033fb61bc3312eeef74aa730be15dc1dba83b
parent02eb277b8673b8806c3085a87aa3e13d608d507a (diff)
parentbf294ea45382d159a68385ceaaf3025336e88f95 (diff)
Merge "Only pass distinct services to enabled_services list"
-rw-r--r--puppet/all-nodes-config.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 081ebb4c..b1284452 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -116,7 +116,10 @@ resources:
map_merge:
- tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources}
- tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups}
- - enabled_services: {get_param: enabled_services}
+ - enabled_services:
+ yaql:
+ expression: $.data.distinct()
+ data: {get_param: enabled_services}
# This writes out a mapping of service_name_enabled: 'true'
# For any services not enabled, hiera foo_enabled will
# return nil, as it's undefined