Merge lp:~zulcss/glance/lp1307518 into lp:~ubuntu-server-dev/glance/icehouse

[Chuck Short]

[lp:~zulcss/glance/lp1307518]

288. By Chuck Short on 2014-04-14

debian/glance-common.postinst: Change permissions on
/var/lib/glance/images and /var/lib/glance/image-cache
(LP: #1302044)

289. By Chuck Short on 2014-04-14

conditional chown

[James Page (james-page)]

Generally - use a -d instead of -e.

41 + if [ -e /var/lib/glance/image-cache]; then
42 + /var/lib/glance/image-cache
43 + fi

needs a space after (image-cache) on 41

also needs to chown glance:glance -R /var/lib/glance/image-cache

review: Needs Fixing

[lp:~zulcss/glance/lp1307518]

290. By Chuck Short on 2014-04-14

Update postiinst

[James Page (james-page)]

"-e" -> "-d"

review: Needs Fixing

[lp:~zulcss/glance/lp1307518]

291. By Chuck Short on 2014-04-14

Revert commit

292. By Chuck Short on 2014-04-14

[ Chuck Short
* debian/glance-common.postinst: Set correct owner/group for /var/lib/glance
and subdirs only on local filesystems (LP: #1302044).

293. By Chuck Short on 2014-04-14

Fix up changelog

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-12 12:45:23 +0000
+++ debian/changelog	2014-04-14 14:56:54 +0000
@@ -1,7 +1,14 @@
 glance (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
 
+   [ Chuck Short ]
    * New upstream release candidate (LP: #1299055).
    * debian/patches/sql_conn.patch: Refreshed.
+   * debian/glance-api.install: Install missing schema.json file.
+     (LP: #1307518)
+
+  [ Thomas Bechtold ]
+  * debian/glance-common.postinst: Set correct owner/group for /var/lib/glance
+    and subdirs only on local filesystems (LP: #1302044).
 
  -- Chuck Short <[e-mail]>  Sat, 12 Apr 2014 08:45:20 -0400
 
 
=== modified file 'debian/glance-api.install'
--- debian/glance-api.install	2012-11-26 13:36:21 +0000
+++ debian/glance-api.install	2014-04-14 14:56:54 +0000
@@ -2,6 +2,7 @@
 etc/glance-api.conf etc/glance
 etc/glance-cache.conf etc/glance
 etc/glance-scrubber.conf etc/glance
+etc/schema-image.json etc/glance
 etc/policy.json etc/glance
 usr/bin/glance-api
 usr/bin/glance-cache-cleaner
 
=== modified file 'debian/glance-common.postinst'
--- debian/glance-common.postinst	2014-03-17 13:21:04 +0000
+++ debian/glance-common.postinst	2014-04-14 14:56:54 +0000
@@ -16,7 +16,7 @@
 	chmod 0750 /var/log/glance
 	chown glance:glance -R /etc/glance
 	chmod 0750 /etc/glance
-	chown glance:glance /var/lib/glance
+	find /var/lib/glance -xdev -type d -exec chown glance:glance {} \;
 fi
 
 #DEBHELPER#