Alexandros Kosiaris has submitted this change and it was merged.
Change subject: openldap: Parameterize loglevel
......................................................................
openldap: Parameterize loglevel
Allow loglevel to be supplied as a parameter. Then override it for
seaborgium and serpens to ease their logging rates
Change-Id: If27bab5039296227b49b943006ceb9505a36710d
---
M hieradata/hosts/seaborgium.yaml
M hieradata/hosts/serpens.yaml
M modules/openldap/manifests/init.pp
M modules/openldap/templates/slapd.erb
4 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/seaborgium.yaml b/hieradata/hosts/seaborgium.yaml
index 11afb59..62c59a0 100644
--- a/hieradata/hosts/seaborgium.yaml
+++ b/hieradata/hosts/seaborgium.yaml
@@ -1,2 +1,3 @@
openldap::master: ldap-labs.codfw.wikimedia.org
openldap::server_id: 1
+openldap::loglevel: sync
diff --git a/hieradata/hosts/serpens.yaml b/hieradata/hosts/serpens.yaml
index 5f07622..3ec91ee 100644
--- a/hieradata/hosts/serpens.yaml
+++ b/hieradata/hosts/serpens.yaml
@@ -1,2 +1,3 @@
openldap::master: ldap-labs.eqiad.wikimedia.org
openldap::server_id: 2
+openldap::loglevel: sync
diff --git a/modules/openldap/manifests/init.pp
b/modules/openldap/manifests/init.pp
index b11b248..0dd39c5 100644
--- a/modules/openldap/manifests/init.pp
+++ b/modules/openldap/manifests/init.pp
@@ -64,6 +64,7 @@
$extra_acls=undef,
$extra_indices=undef,
$size_limit=undef,
+ $loglevel='sync stats',
) {
require_package('slapd', 'ldap-utils', 'python-ldap')
diff --git a/modules/openldap/templates/slapd.erb
b/modules/openldap/templates/slapd.erb
index 0fe817b..1888d00 100644
--- a/modules/openldap/templates/slapd.erb
+++ b/modules/openldap/templates/slapd.erb
@@ -28,7 +28,7 @@
argsfile /var/run/slapd/slapd.args
# Read slapd.conf(5) for possible values
-loglevel sync stats
+loglevel <%= @loglevel %>
# Where the dynamically loaded modules are stored
modulepath /usr/lib/ldap
--
To view, visit https://gerrit.wikimedia.org/r/257675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If27bab5039296227b49b943006ceb9505a36710d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
