Rush has submitted this change and it was merged.
Change subject: nscld changes need to restart nscd as well
......................................................................
nscld changes need to restart nscd as well
Bug: T131541
Change-Id: I1f331a196e8929c9847a1cd98133409d06f4a86d
---
M modules/ldap/manifests/client/nss.pp
1 file changed, 15 insertions(+), 14 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/modules/ldap/manifests/client/nss.pp
b/modules/ldap/manifests/client/nss.pp
index 4ee931e..fd8fd1b 100644
--- a/modules/ldap/manifests/client/nss.pp
+++ b/modules/ldap/manifests/client/nss.pp
@@ -2,6 +2,7 @@
$ldapconfig = undef,
$nsswitch_conf_source = 'puppet:///modules/ldap/nsswitch.conf',
) {
+
package { [ 'libnss-ldapd',
'nss-updatedb',
'libnss-db',
@@ -9,20 +10,9 @@
'nslcd' ]:
ensure => latest,
}
+
package { [ 'libnss-ldap' ]:
ensure => purged,
- }
-
- service { 'nscd':
- ensure => running,
- subscribe => File['/etc/ldap/ldap.conf'],
- require => Package['nscd'],
- }
-
- service { 'nslcd':
- ensure => running,
- subscribe => File['/etc/ldap/ldap.conf'],
- require => Package['nslcd'],
}
File {
@@ -72,7 +62,18 @@
content => template('ldap/nslcd.conf.erb'),
mode => '0440',
require => Package['nslcd'],
- notify => Service[nslcd],
+ notify => Service['nscd','nslcd'],
+ }
+
+ service { 'nscd':
+ ensure => running,
+ subscribe => File['/etc/ldap/ldap.conf'],
+ require => Package['nscd'],
+ }
+
+ service { 'nslcd':
+ ensure => running,
+ subscribe => File['/etc/ldap/ldap.conf'],
+ require => Package['nslcd'],
}
}
-
--
To view, visit https://gerrit.wikimedia.org/r/282165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f331a196e8929c9847a1cd98133409d06f4a86d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
