Updated upstart scripts.

Rewritten-From: 27b8e7267f5f47c07366eff0982689d34a306ff6

diff --git a/xenial/debian/cinder-api.upstart.in b/xenial/debian/cinder-api.upstart.in
index 1fbeb327ade2a68a93cc364d0f366a57d42719ce..2d6d07154d254f02f8401cf8187c80cf307307bc 100644 (file)
--- a/xenial/debian/cinder-api.upstart.in
+++ b/xenial/debian/cinder-api.upstart.in
@@ -2,7 +2,7 @@ description "Cinder api server"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@ pre-start script
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-api --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-api \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log

diff --git a/xenial/debian/cinder-scheduler.upstart.in b/xenial/debian/cinder-scheduler.upstart.in
index d03cb4e219702925a88c38dfa77c2b5716b91315..c321041e58e4e65ae4d7e50b22c60181acf8dfbb 100644 (file)
--- a/xenial/debian/cinder-scheduler.upstart.in
+++ b/xenial/debian/cinder-scheduler.upstart.in
@@ -2,7 +2,7 @@ description "Cinder scheduler server"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@ pre-start script
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-scheduler --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-scheduler \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log

diff --git a/xenial/debian/cinder-volume.upstart.in b/xenial/debian/cinder-volume.upstart.in
index 9544ec7c75127dc585caa242114606df8a7f325f..dd3295adf590ad915a3e14b0b9a93fc9783e30b6 100644 (file)
--- a/xenial/debian/cinder-volume.upstart.in
+++ b/xenial/debian/cinder-volume.upstart.in
@@ -2,7 +2,7 @@ description "Cinder volume server"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
-stop on runlevel [016]
+stop on runlevel [!2345]
 
 chdir /var/run
 
@@ -14,4 +14,5 @@ pre-start script
     chown cinder:root /var/lock/cinder
 end script
 
-exec su -s /bin/sh -c "exec cinder-volume --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log" cinder
+exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume \
+     -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log