Yuvipanda has submitted this change and it was merged.
Change subject: redis: Add upstart support to redis::instance
......................................................................
redis: Add upstart support to redis::instance
Bug: T118704
Change-Id: I10eed026a9a2bd99a14e575159d065541d75a8d0
---
M modules/redis/manifests/instance.pp
A modules/redis/templates/initscripts/redis-instance.upstart.erb
2 files changed, 16 insertions(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/manifests/instance.pp
b/modules/redis/manifests/instance.pp
index cf62bc3..e02dfb8 100644
--- a/modules/redis/manifests/instance.pp
+++ b/modules/redis/manifests/instance.pp
@@ -34,7 +34,6 @@
validate_ensure($ensure)
validate_hash($settings)
- validate_re($::initsystem, 'systemd')
include ::redis
@@ -81,6 +80,7 @@
ensure => $ensure,
template_name => 'redis-instance',
systemd => true,
+ upstart => true,
subscribe => File["/etc/redis/${instance_name}.conf"],
}
}
diff --git a/modules/redis/templates/initscripts/redis-instance.upstart.erb
b/modules/redis/templates/initscripts/redis-instance.upstart.erb
new file mode 100644
index 0000000..b945e3d
--- /dev/null
+++ b/modules/redis/templates/initscripts/redis-instance.upstart.erb
@@ -0,0 +1,15 @@
+description "Advanced key-value store"
+
+start on started network-services
+
+setuid redis
+setgid redis
+
+exec /usr/bin/redis-server /etc/redis/<%= @instance_name %>.conf
+
+# We expect daemonize=yes
+expect fork
+
+respawn
+
+# vim: set ft=upstart:
--
To view, visit https://gerrit.wikimedia.org/r/253295
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10eed026a9a2bd99a14e575159d065541d75a8d0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
