openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "RabbitMQ element: Move /var/run/rabbitmq"

This commit is contained in:
Jenkins 2014-06-26 15:05:35 +00:00 committed by Gerrit Code Review
parent e9886cdb6c 3d79201a40
commit c8d88d364c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/rabbitmq-server/install.d/20-rabbitmq-server
View File

@ -27,12 +27,16 @@ respawn limit 2 5
env OS_SVC_ENABLE_CONTROL=1
export OS_SVC_ENABLE_CONTROL
pre-start script
[ -d "/var/run/rabbitmq" ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq
end script
exec /usr/sbin/rabbitmq-server > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
post-start exec /usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid >/dev/null 2>&1
pre-stop exec /usr/sbin/rabbitmqctl stop /var/run/rabbitmq/pid >/dev/null 2>&1
# Get the Erlang nameserver too.
post-stop exec /usr/bin/pkill -u rabbitmq >/dev/null 2>&1
eof
fi

1
elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq
View File

@ -2,7 +2,6 @@
set -eux
[ -d /var/run/rabbitmq ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq
[ -d /mnt/state/var/log/rabbitmq ] || install -d -D -m 0770 -o rabbitmq -g rabbitmq /mnt/state/var/log/rabbitmq
os-svc-enable -n rabbitmq-server