Andrew Bogott has submitted this change and it was merged. Change subject: Pass an array to function_versioncmp. ......................................................................
Pass an array to function_versioncmp. function_versioncmp() should take an array containing the two versions rather than the versions as separate args. There's a discussion (and inadequate explanation) of this here: http://projects.puppetlabs.com/issues/10934 The previous version worked fine, but it threw a ton of warnings on the puppetmaster like this: "/usr/lib/ruby/1.8/puppet/parser/functions/versioncmp.rb:30: warning: multiple values for a block parameter (2 for 1)" Change-Id: Ied8e6c2871657e876367aff7205c1cb8fbe986f7 --- M modules/ldap/templates/nslcd.conf.erb M templates/base/puppet.cron.erb 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ldap/templates/nslcd.conf.erb b/modules/ldap/templates/nslcd.conf.erb index 7d27a7a..edb5065 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 %> diff --git a/templates/base/puppet.cron.erb b/templates/base/puppet.cron.erb index ca99168..af56848 100644 --- a/templates/base/puppet.cron.erb +++ b/templates/base/puppet.cron.erb @@ -1,5 +1,5 @@ ## This file is managed by Puppet! ## templates/base/puppet.cron.erb <% $crontime = scope.lookupvar('base::puppet::crontime') -%> -<%= $crontime %>,<%= $crontime.to_i + 30 %> * * * * root timeout <% if scope.function_versioncmp(lsbdistrelease, "12.04") >= 0 %> -k 300<% end %> 1800 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1 -@reboot root timeout <% if scope.function_versioncmp(lsbdistrelease, "12.04") >= 0 %> -k 300<% end %> 1800 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1 +<%= $crontime %>,<%= $crontime.to_i + 30 %> * * * * root timeout <% if scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0 %> -k 300<% end %> 1800 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1 +@reboot root timeout <% if scope.function_versioncmp([lsbdistrelease, "12.04"]) >= 0 %> -k 300<% end %> 1800 puppet agent --onetime --verbose --no-daemonize --no-splay --show_diff >> /var/log/puppet.log 2>&1 -- To view, visit https://gerrit.wikimedia.org/r/76517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied8e6c2871657e876367aff7205c1cb8fbe986f7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Pyoungmeister <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
