Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/253294
Change subject: redis: Make redis::instance use base::service_unit
......................................................................
redis: Make redis::instance use base::service_unit
- So we get a different systemd service for each redis instance
rather than a 'instance' of the same systemd service
- Makes it easier to add upstart support in a followup commit
Change-Id: I15c1aeeb41f2bb6b2af5d8916380febc5908c450
---
M modules/redis/manifests/instance.pp
R modules/redis/templates/initscripts/redis-instance.systemd.erb
2 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/253294/1
diff --git a/modules/redis/manifests/instance.pp
b/modules/redis/manifests/instance.pp
index e05f845..cf62bc3 100644
--- a/modules/redis/manifests/instance.pp
+++ b/modules/redis/manifests/instance.pp
@@ -77,14 +77,10 @@
mode => '0444',
}
- file {
"/etc/systemd/system/multi-user.target.wants/redis-instance@${instance_name}.service":
- ensure => ensure_link($ensure),
- target => '/lib/systemd/system/[email protected]',
- }
-
- service { "redis-instance@${instance_name}":
- ensure => ensure_service($ensure),
- provider => 'systemd',
- subscribe => File["/etc/redis/${instance_name}.conf"],
+ base::service_unit { "redis-instance-${instance_name}":
+ ensure => $ensure,
+ template_name => 'redis-instance',
+ systemd => true,
+ subscribe => File["/etc/redis/${instance_name}.conf"],
}
}
diff --git a/modules/redis/files/[email protected]
b/modules/redis/templates/initscripts/redis-instance.systemd.erb
similarity index 63%
rename from modules/redis/files/[email protected]
rename to modules/redis/templates/initscripts/redis-instance.systemd.erb
index d30ad7e..ab1a09c 100644
--- a/modules/redis/files/[email protected]
+++ b/modules/redis/templates/initscripts/redis-instance.systemd.erb
@@ -4,7 +4,7 @@
[Service]
Type=forking
-ExecStart=/usr/bin/redis-server /etc/redis/%i.conf
+ExecStart=/usr/bin/redis-server /etc/redis/<%= @instance_name %>.conf
Restart=always
User=redis
Group=redis
--
To view, visit https://gerrit.wikimedia.org/r/253294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I15c1aeeb41f2bb6b2af5d8916380febc5908c450
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
