Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: redis: do not 'expect fork' if daemonize = false in the
settings.
......................................................................
redis: do not 'expect fork' if daemonize = false in the settings.
Change-Id: I4e632e66f763ece7055483fa426cf6077717ce4c
---
M modules/redis/templates/initscripts/redis-instance.upstart.erb
M modules/role/manifests/deployment/server.pp
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/redis/templates/initscripts/redis-instance.upstart.erb
b/modules/redis/templates/initscripts/redis-instance.upstart.erb
index 69e1450..1715c07 100644
--- a/modules/redis/templates/initscripts/redis-instance.upstart.erb
+++ b/modules/redis/templates/initscripts/redis-instance.upstart.erb
@@ -5,7 +5,7 @@
setuid redis
setgid redis
-expect fork
+<% unless @settings['daemonize'] == false %>expect fork<% end %>
exec /usr/bin/redis-server /etc/redis/<%= @instance_name %>.conf
respawn
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 4a3c889..bd81d0d 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -78,7 +78,9 @@
require => File['/srv/deployment'],
}
- redis::instance { 6379: }
+ redis::instance { 6379:
+ daemonize => false,
+ }
# Used by the trebuchet salt returner
ferm::service { 'deployment-redis':
--
To view, visit https://gerrit.wikimedia.org/r/265238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e632e66f763ece7055483fa426cf6077717ce4c
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
