Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367647 )
Change subject: etcdmirror: convert to using systemd::service
......................................................................
etcdmirror: convert to using systemd::service
The service is systemd-only, and this will work with the future parser
as well.
Change-Id: I47671cbdc645b2bd06844247d0b978bb2c1e729e
---
M modules/etcdmirror/manifests/instance.pp
M modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
2 files changed, 11 insertions(+), 8 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/etcdmirror/manifests/instance.pp
b/modules/etcdmirror/manifests/instance.pp
index 10f5cf9..a455ab1 100644
--- a/modules/etcdmirror/manifests/instance.pp
+++ b/modules/etcdmirror/manifests/instance.pp
@@ -16,6 +16,10 @@
# [*enable*] If service is to be enabled or not
#
define etcdmirror::instance($src, $src_path, $dst, $dst_path, $enable) {
+ unless ($::initsystem == 'systemd') {
+ fail('This manifest only works with systemd')
+ }
+
require_package('etcd-mirror')
# safe version of the title
@@ -27,13 +31,12 @@
}
$service_params = { ensure => $service_status, }
- base::service_unit { $prefix:
- ensure => present,
- systemd => true,
- declare_service => true,
- refresh => false,
- service_params => $service_params,
- template_name => 'etcd-mirror',
+
+ systemd::service { $prefix:
+ ensure => present,
+ content =>
template('etcdmirror/initscripts/etcd-mirror.systemd.erb'),
+ restart => false,
+ service_params => $service_params,
}
systemd::syslog { $prefix:
diff --git a/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
b/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
index f5e62a5..4475e03 100644
--- a/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
+++ b/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
@@ -8,7 +8,7 @@
Environment=ETCD_MIRROR_DST_PREFIX=<%= @dst_path %>
Environment=ETCD_MIRROR_SRC_URL=<%= @src %>
Environment=ETCD_MIRROR_DST_URL=<%= @dst %>
-SyslogIdentifier=<%= @title %>
+SyslogIdentifier=<%= @prefix %>
ExecStart=/usr/bin/etcd-mirror --strip --src-prefix $ETCD_MIRROR_SRC_PREFIX
--dst-prefix $ETCD_MIRROR_DST_PREFIX $ETCD_MIRROR_SRC_URL $ETCD_MIRROR_DST_URL
Restart=always
RestartPreventExitStatus=1 2
--
To view, visit https://gerrit.wikimedia.org/r/367647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47671cbdc645b2bd06844247d0b978bb2c1e729e
Gerrit-PatchSet: 4
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
