Merge lp:~ttx/nova/lp820968 into lp:~openstack-ubuntu-packagers/nova/ubuntu

[Thierry Carrez]

No longer run nova-objectstore as root (LP: #820968)

[lp:~ttx/nova/lp820968]

176. By Thierry Carrez on 2011-08-23

Missing quote, darnit

[Dave Walker (davewalker)]

Is --nodaemon required to let upstart supervise it correctly?

Is --logfile now handled from the conf?

Thanks.

review: Needs Information

[Thierry Carrez (ttx)]

--nodaemon and --logfile are ignored. It is now started as the other (eventlet-powered) daemons.

[Dave Walker (davewalker)]

Super, thanks. +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-12 07:13:18 +0000
+++ debian/changelog	2011-08-23 13:05:28 +0000
@@ -1,3 +1,9 @@
+nova (2011.3~d4~20110812.1417-0ubuntu2) UNRELEASED; urgency=low
+
+  * No longer run nova-objectstore as root (LP: #820968)
+
+ -- Thierry Carrez (ttx) <[e-mail]>  Mon, 22 Aug 2011 14:43:38 +0200
+
 nova (2011.3~d4~20110812.1417-0ubuntu1) oneiric; urgency=low
 
   [Chuck Short]

=== modified file 'debian/nova-objectstore.upstart.in'
--- debian/nova-objectstore.upstart.in	2011-08-11 11:27:36 +0000
+++ debian/nova-objectstore.upstart.in	2011-08-23 13:05:28 +0000
@@ -14,9 +14,4 @@
 	chown nova:root /var/lock/nova/
 end script
 
-script
-    PIDFILE=/var/run/nova/nova-objectstore.pid
-    uid="$(getent passwd nova | cut -f3 -d:)"
-    gid="$(getent passwd nova | cut -f4 -d:)"
-    nova-objectstore --uid $uid --gid $gid --pidfile $PIDFILE --flagfile=/etc/nova/nova.conf --nodaemon --logfile=/var/log/nova/nova-objectstore.log
-end script
+exec su -c "nova-objectstore --flagfile=/etc/nova/nova.conf" nova