Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367649 )
Change subject: systemd::syslog: depend on the service, not base::service_unit
......................................................................
systemd::syslog: depend on the service, not base::service_unit
Change-Id: I92e207b286377f3f3233433d79ea3c87b6783938
---
M modules/systemd/manifests/syslog.pp
M modules/systemd/spec/defines/systemd_syslog_spec.rb
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/systemd/manifests/syslog.pp
b/modules/systemd/manifests/syslog.pp
index 9a25a05..59bc910 100644
--- a/modules/systemd/manifests/syslog.pp
+++ b/modules/systemd/manifests/syslog.pp
@@ -74,7 +74,10 @@
content => template('systemd/rsyslog.conf.erb'),
priority => 20,
require => File[$local_logdir],
- before => Base::Service_unit[$title],
+ }
+
+ if defined(Service[$title]) {
+ Rsyslog::Conf[$title] -> Service[$title]
}
logrotate::conf { $title:
diff --git a/modules/systemd/spec/defines/systemd_syslog_spec.rb
b/modules/systemd/spec/defines/systemd_syslog_spec.rb
index 8194736..17e3436 100644
--- a/modules/systemd/spec/defines/systemd_syslog_spec.rb
+++ b/modules/systemd/spec/defines/systemd_syslog_spec.rb
@@ -24,7 +24,7 @@
end
it 'should configure rsyslog before the service' do
should contain_rsyslog__conf('dummyservice')
- .that_comes_before('Base::Service_unit[dummyservice]')
+ .that_comes_before('Service[dummyservice]')
end
it 'should configure rsyslog to match programname dummyservice' do
should contain_file('/etc/rsyslog.d/20-dummyservice.conf')
--
To view, visit https://gerrit.wikimedia.org/r/367649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92e207b286377f3f3233433d79ea3c87b6783938
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
