Merge lp:~james-page/ubuntu/oneiric/nova/fix-new-installs into lp:~ubuntu-server-dev/nova/diablo

[James Page]

This should fix the case of a NEW nova installation - where the permissions on /var/lib/nova should always be set to nova:nova as it won't contain any running instances.

I've tested this:

1) as an upgrade to a fixed install of -0ubuntu4
2) as a fresh install

Both now work.

[Scott Moser (smoser)]

seems reasonable.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-30 19:22:13 +0000
+++ debian/changelog	2011-10-03 10:59:17 +0000
@@ -1,3 +1,11 @@
+nova (2011.3-0ubuntu5) oneiric; urgency=low
+
+  * debian/nova-common.postinst:
+    - Set permissions recursively on /var/lib/nova to nova:nova for new
+      installations (LP: #865169).
+
+ -- James Page <[e-mail]>  Mon, 03 Oct 2011 11:02:34 +0100
+
 nova (2011.3-0ubuntu4) oneiric; urgency=low
 
   [James Page]

=== modified file 'debian/nova-common.postinst'
--- debian/nova-common.postinst	2011-09-30 19:18:10 +0000
+++ debian/nova-common.postinst	2011-10-03 10:59:17 +0000
@@ -11,8 +11,12 @@
         usermod -g nova nova
     fi
     chown -R nova:nova /var/log/nova/ /etc/nova/nova.conf
-    if dpkg --compare-versions "$2" lt "2011.3-0ubuntu4"; then
+    if [ -z "$2" ]; then
+        # New install - blanket permissions
+        chown -R nova:nova /var/lib/nova/
+    elif dpkg --compare-versions "$2" lt "2011.3-0ubuntu4"; then
         # Make sure the LXC rootfs mount points are excluded
+        # during upgrades from previous versions
         find /var/lib/nova/ -name 'rootfs' -prune -o \
            -group root -a -user nova -exec chown nova:nova {} \;
         find /var/lib/nova/ -name 'rootfs' -prune -o \