------------------------------------------------------------
revno: 8
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sat 2013-12-21 12:08:17 +0000
message:
auto update
removed:
etc/init/maas-region-celery.conf
etc/init/maas-txlongpoll.conf
modified:
etc/init/maas-cluster-celery.conf
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init/maas-cluster-celery.conf'
--- etc/init/maas-cluster-celery.conf 2013-11-18 12:42:03 +0000
+++ etc/init/maas-cluster-celery.conf 2013-12-21 12:08:17 +0000
@@ -26,5 +26,5 @@
# Allow the cluster-controller process to read CLUSTER_UUID as set
# in that config file.
export CLUSTER_UUID
- exec /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas
+ exec /usr/bin/authbind --deep /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas
end script
=== removed file 'etc/init/maas-region-celery.conf'
--- etc/init/maas-region-celery.conf 2013-11-18 12:42:03 +0000
+++ etc/init/maas-region-celery.conf 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# maas-celery - celery daemon for the region controller
-#
-# MAAS Region Controller Celery Daemon
-
-description "MAAS"
-author "Raphael Badin <[email protected]>"
-
-start on filesystem and net-device-up and rabbitmq-server-running
-stop on runlevel [016]
-
-respawn
-
-env workers_user="maas_workers"
-env workers_pass=""
-env workers_vhost="/maas_workers"
-
-pre-start script
- if ! /usr/sbin/rabbitmqctl list_user_permissions $workers_user 1>/dev/null 2>&1; then
- workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
- /usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
- /usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
- /usr/sbin/rabbitmqctl set_permissions -p "$workers_vhost" "$workers_user" ".*" ".*" ".*"
- fi
-end script
-
-exec /usr/sbin/maas-region-celeryd --logfile=/var/log/maas/celery-region.log --schedule=/var/lib/maas/celerybeat-region-schedule --user=maas --group=maas
=== removed file 'etc/init/maas-txlongpoll.conf'
--- etc/init/maas-txlongpoll.conf 2013-11-18 12:42:03 +0000
+++ etc/init/maas-txlongpoll.conf 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# maas - txlongpoll service
-#
-# MAAS Provisioning Service txlongpoll
-
-description "MAAS txlongpoll"
-author "Andres Rodriguez <[email protected]>"
-
-start on filesystem and net-device-up and rabbitmq-server-running
-stop on runlevel [016]
-
-respawn
-
-env longpoll_user="maas_longpoll"
-env longpoll_pass=""
-env longpoll_vhost="/maas_longpoll"
-
-pre-start script
- if ! /usr/sbin/rabbitmqctl list_user_permissions $longpoll_user 1>/dev/null 2>&1; then
- longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
- /usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
- /usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"
- /usr/sbin/rabbitmqctl set_permissions -p "$longpoll_vhost" "$longpoll_user" ".*" ".*" ".*"
- fi
-end script
-
-# To add options to your daemon, edit the line below:
-exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-txlongpoll.pid --logfile=/dev/null txlongpoll --config-file=/etc/maas/txlongpoll.yaml
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
