Matanya has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111745

Change subject: ldap: puppet 3 compatibility fix: fully qualify variable
......................................................................

ldap: puppet 3 compatibility fix: fully qualify variable

Change-Id: I3b7a70e1c1bb9437779d6b6b09d74eb1db39873b
---
M modules/ldap/templates/nslcd.conf.erb
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/45/111745/1

diff --git a/modules/ldap/templates/nslcd.conf.erb 
b/modules/ldap/templates/nslcd.conf.erb
index edb5065..9a6a3bc 100644
--- a/modules/ldap/templates/nslcd.conf.erb
+++ b/modules/ldap/templates/nslcd.conf.erb
@@ -33,12 +33,12 @@
 tls_cacertfile /etc/ssl/certs/<%= ldapconfig["ca"] %>
 
 
-<% if scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0 %># Limit user 
names to this regex. This needs to be kept in sync with OpenStackManager's 
regex.
+<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) >= 0 %># Limit 
user names to this regex. This needs to be kept in sync with OpenStackManager's 
regex.
 validnames /^[a-z][a-z0-9_-]*$/i<% end %>
 
 # Group mapping for sudo-ldap.
-<% if scope.function_versioncmp([lsbdistrelease, "12.04"]) < 0 %>map group 
uniquemember member<% end %>
+<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) < 0 %>map group 
uniquemember member<% end %>
 <% if realm == "labs" %>map passwd loginshell "/bin/bash"<% end %>
 
 pagesize <%= ldapconfig["pagesize"] %>
-<% if scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0 %>nss_min_uid 
<%= ldapconfig["nss_min_uid"] %><% end %>
+<% if scope.function_versioncmp([@lsbdistrelease, "12.04"]) >= 0 %>nss_min_uid 
<%= ldapconfig["nss_min_uid"] %><% end %>

-- 
To view, visit https://gerrit.wikimedia.org/r/111745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b7a70e1c1bb9437779d6b6b09d74eb1db39873b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to