From 9d74073c0d10f24485f98308aa99328ff3402a22 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Mon, 4 Jul 2016 22:37:21 +0300 Subject: [PATCH] Update ordering for slapd config generation Ordering was updated to generate valid slapd config Change-Id: I35bd45465582219a645e9099ad7964fa3febc10c Related-Bug: #1598743 --- .../modules/plugin_ldap/manifests/ldap_proxy_install.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment_scripts/puppet/modules/plugin_ldap/manifests/ldap_proxy_install.pp b/deployment_scripts/puppet/modules/plugin_ldap/manifests/ldap_proxy_install.pp index ddc8e0f..5e70bd1 100644 --- a/deployment_scripts/puppet/modules/plugin_ldap/manifests/ldap_proxy_install.pp +++ b/deployment_scripts/puppet/modules/plugin_ldap/manifests/ldap_proxy_install.pp @@ -32,7 +32,7 @@ class plugin_ldap::ldap_proxy_install ( } if $base_config_label in $slapd_config_template { - concat::fragment { "base_fragment" : + concat::fragment { 'base_fragment' : target => $slapd_config, content => template('plugin_ldap/slapd_base.erb'), order => '10', @@ -44,14 +44,14 @@ class plugin_ldap::ldap_proxy_install ( concat::fragment { "${domain_name}_fragment" : target => $slapd_config, content => template('plugin_ldap/slapd_conf.erb'), - order => '20', + order => '30', } } else { concat::fragment { "${domain_name}_tls_fragment" : target => $slapd_config, content => template('plugin_ldap/slapd_tls_conf.erb'), - order => '20', + order => '30', } } } @@ -60,7 +60,7 @@ class plugin_ldap::ldap_proxy_install ( concat::fragment { 'ldap_proxy_init' : target => $slapd_config, content => $slapd_custom_config, - order => '30', + order => '20', } } }