Merge lp:~gandelman-a/nova/lp839796_and_856530 into lp:~ubuntu-server-dev/nova/diablo

[Adam Gandelman]

* debian/nova-common.postinst: Create 'nova' group, add user to it
 (LP: #856530)
* debian/nova.conf, debian/nova-compute.upstart.in: Move reference of
  nova-compute.conf from nova.conf to nova-compute's argv. (LP: #839796)

[Chuck Short (zulcss)]

lgtm

review: Approve

[Scott Moser (smoser)]

did you/could you propose this same merge to lp:~openstack-ubuntu-packagers/nova/ubuntu ?

[Adam Gandelman (gandelman-a)]

Scott-- Applied to upstream packaging branch and proposed via lp:~gandelman-a/nova/openstack-ubuntu-packagers

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-26 20:08:15 +0000
+++ debian/changelog	2011-09-27 01:54:17 +0000
@@ -1,5 +1,11 @@
 nova (2011.3-0ubuntu3) UNRELEASED; urgency=low
 
+  [Adam Gandelman]
+  * debian/nova-common.postinst: Create 'nova' group, add user to it
+    (LP: #856530)
+  * debian/nova.conf, debian/nova-compute.upstart.in: Move reference of
+    nova-compute.conf from nova.conf to nova-compute's argv. (LP: #839796)
+
   [Chuck Short]
   * debian/patches/backport-recreate-gateway-using-dhcp.patch:
     Makes sure to recreate gateway for moved ip. (LP: #859587)
 
=== modified file 'debian/nova-common.postinst'
--- debian/nova-common.postinst	2011-08-11 11:27:36 +0000
+++ debian/nova-common.postinst	2011-09-27 01:54:17 +0000
@@ -1,16 +1,19 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
+    if ! getent group nova > /dev/null 2>&1; then
+        addgroup --system nova >/dev/null
+    fi
     if ! getent passwd nova > /dev/null 2>&1; then
-        adduser --system --home /var/lib/nova --no-create-home --shell /bin/bash nova
+        adduser --system --home /var/lib/nova --ingroup nova --no-create-home --shell /bin/bash nova
     fi
-    chown -R nova:root /var/lib/nova/ /var/log/nova/ /etc/nova/nova.conf
+    chown -R nova:nova /var/lib/nova/ /var/log/nova/ /etc/nova/nova.conf
     chmod 600 /etc/nova/nova.conf
-	chmod 0440 /etc/sudoers.d/nova_sudoers
-	if ! grep -q sql_connection /etc/nova/nova.conf
-	then
-		su -c 'nova-manage db sync' nova
-	fi
+    chmod 0440 /etc/sudoers.d/nova_sudoers
+    if ! grep -q sql_connection /etc/nova/nova.conf
+    then
+      su -c 'nova-manage db sync' nova
+    fi
 fi
 
 #DEBHELPER#
 
=== modified file 'debian/nova-compute.upstart.in'
--- debian/nova-compute.upstart.in	2011-08-11 13:29:06 +0000
+++ debian/nova-compute.upstart.in	2011-09-27 01:54:17 +0000
@@ -17,4 +17,4 @@
 	modprobe nbd
 end script
 
-exec su -c "nova-compute --flagfile=/etc/nova/nova.conf" nova
+exec su -c "nova-compute --flagfile=/etc/nova/nova.conf --flagfile=/etc/nova/nova-compute.conf" nova
 
=== modified file 'debian/nova.conf'
--- debian/nova.conf	2011-09-23 15:44:49 +0000
+++ debian/nova.conf	2011-09-27 01:54:17 +0000
@@ -3,7 +3,6 @@
 --logdir=/var/log/nova
 --state_path=/var/lib/nova
 --lock_path=/var/lock/nova
---flagfile=/etc/nova/nova-compute.conf
 --force_dhcp_release=True
 --use_deprecated_auth
 --iscsi_helper=tgtadm