summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-11-13 18:38:38 +0000
committerRichard Ipsum <richardipsum@fastmail.co.uk>2014-11-27 18:12:13 +0000
commitaa8fafe14df3721d973353fd5925be9297d42848 (patch)
tree48421ef1f3eeb7883fd6294620373c26c4113daa
parent1ed2f361a557e12aa303e6f1a72f95a82656a884 (diff)
downloaddefinitions-aa8fafe14df3721d973353fd5925be9297d42848.tar.gz
FIXUPME: Add rabbitmq-server systemd unit using notify
-rw-r--r--openstack/etc/systemd/system/openstack-rabbitmq-server.service9
1 files changed, 2 insertions, 7 deletions
diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-server.service b/openstack/etc/systemd/system/openstack-rabbitmq-server.service
index 6f12e437..91bd6fa7 100644
--- a/openstack/etc/systemd/system/openstack-rabbitmq-server.service
+++ b/openstack/etc/systemd/system/openstack-rabbitmq-server.service
@@ -4,18 +4,13 @@ After=syslog.target network.target openstack-rabbitmq-setup.service
Requires=openstack-rabbitmq-setup.service
[Service]
-Type=simple
+Type=notify
User=rabbitmq
Group=rabbitmq
-Environment="RABBITMQ_PID_FILE=/var/run/rabbitmq/pid" "HOME=/var/lib/rabbitmq"
+Environment="HOME=/var/lib/rabbitmq"
WorkingDirectory=/var/lib/rabbitmq
-# Ensure cookie is created to avoid race
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1059913
-ExecStartPre=-/bin/sh -c '/usr/sbin/rabbitmqctl status > /dev/null 2>&1'
ExecStart=/usr/sbin/rabbitmq-server
-ExecStartPost=/usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid
ExecStop=/usr/sbin/rabbitmqctl stop
-ExecStopPost=/bin/rm /var/run/rabbitmq/pid
[Install]
WantedBy=multi-user.target