summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksym Yatsenko <myatsenko@mirantis.com>2016-07-04 22:37:21 +0300
committerMaksym Yatsenko <myatsenko@mirantis.com>2016-07-04 22:37:21 +0300
commit9d74073c0d10f24485f98308aa99328ff3402a22 (patch)
tree8fcc9af758f2dd1ccbca0d59905bc084c1cb0cbb
parentb60d40b7991486a9627abf3118943b0aef8cb5ce (diff)
Update ordering for slapd config generation
Ordering was updated to generate valid slapd config Change-Id: I35bd45465582219a645e9099ad7964fa3febc10c Related-Bug: #1598743
Notes
Notes (review): Code-Review+2: Ivan Berezovskiy <iberezovskiy@mirantis.com> Workflow+1: Ivan Berezovskiy <iberezovskiy@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 05 Jul 2016 09:36:36 +0000 Reviewed-on: https://review.openstack.org/337361 Project: openstack/fuel-plugin-ldap Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/modules/plugin_ldap/manifests/ldap_proxy_install.pp8
1 files 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 (
32 } 32 }
33 33
34 if $base_config_label in $slapd_config_template { 34 if $base_config_label in $slapd_config_template {
35 concat::fragment { "base_fragment" : 35 concat::fragment { 'base_fragment' :
36 target => $slapd_config, 36 target => $slapd_config,
37 content => template('plugin_ldap/slapd_base.erb'), 37 content => template('plugin_ldap/slapd_base.erb'),
38 order => '10', 38 order => '10',
@@ -44,14 +44,14 @@ class plugin_ldap::ldap_proxy_install (
44 concat::fragment { "${domain_name}_fragment" : 44 concat::fragment { "${domain_name}_fragment" :
45 target => $slapd_config, 45 target => $slapd_config,
46 content => template('plugin_ldap/slapd_conf.erb'), 46 content => template('plugin_ldap/slapd_conf.erb'),
47 order => '20', 47 order => '30',
48 } 48 }
49 } 49 }
50 else { 50 else {
51 concat::fragment { "${domain_name}_tls_fragment" : 51 concat::fragment { "${domain_name}_tls_fragment" :
52 target => $slapd_config, 52 target => $slapd_config,
53 content => template('plugin_ldap/slapd_tls_conf.erb'), 53 content => template('plugin_ldap/slapd_tls_conf.erb'),
54 order => '20', 54 order => '30',
55 } 55 }
56 } 56 }
57 } 57 }
@@ -60,7 +60,7 @@ class plugin_ldap::ldap_proxy_install (
60 concat::fragment { 'ldap_proxy_init' : 60 concat::fragment { 'ldap_proxy_init' :
61 target => $slapd_config, 61 target => $slapd_config,
62 content => $slapd_custom_config, 62 content => $slapd_custom_config,
63 order => '30', 63 order => '20',
64 } 64 }
65 } 65 }
66} 66}