Glance

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

  1. lp1307518
  2. Merge into icehouse
Proposed by Chuck Short
Status: Merged
Merged at revision: 293
Proposed branch: lp:~zulcss/glance/lp1307518
Merge into: lp:~ubuntu-server-dev/glance/icehouse
Diff against target: 43 lines (+9/-1)
3 files modified
debian/changelog (+7/-0)
debian/glance-api.install (+1/-0)
debian/glance-common.postinst (+1/-1)
To merge this branch: bzr merge lp:~zulcss/glance/lp1307518
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+215679@code.launchpad.net
To post a comment you must log in.
lp:~zulcss/glance/lp1307518 updated
288. By Chuck Short

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

289. By Chuck Short

conditional chown

Revision history for this message
James Page (james-page) wrote :

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 updated
290. By Chuck Short

Update postiinst

Revision history for this message
James Page (james-page) wrote :

"-e" -> "-d"

review: Needs Fixing
lp:~zulcss/glance/lp1307518 updated
291. By Chuck Short

Revert commit

292. By Chuck Short

[ 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

Fix up changelog

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-12 12:45:23 +0000
3+++ debian/changelog 2014-04-14 14:56:54 +0000
4@@ -1,7 +1,14 @@
5 glance (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
6
7+ [ Chuck Short ]
8 * New upstream release candidate (LP: #1299055).
9 * debian/patches/sql_conn.patch: Refreshed.
10+ * debian/glance-api.install: Install missing schema.json file.
11+ (LP: #1307518)
12+
13+ [ Thomas Bechtold ]
14+ * debian/glance-common.postinst: Set correct owner/group for /var/lib/glance
15+ and subdirs only on local filesystems (LP: #1302044).
16
17 -- Chuck Short <zulcss@ubuntu.com> Sat, 12 Apr 2014 08:45:20 -0400
18
19
20=== modified file 'debian/glance-api.install'
21--- debian/glance-api.install 2012-11-26 13:36:21 +0000
22+++ debian/glance-api.install 2014-04-14 14:56:54 +0000
23@@ -2,6 +2,7 @@
24 etc/glance-api.conf etc/glance
25 etc/glance-cache.conf etc/glance
26 etc/glance-scrubber.conf etc/glance
27+etc/schema-image.json etc/glance
28 etc/policy.json etc/glance
29 usr/bin/glance-api
30 usr/bin/glance-cache-cleaner
31
32=== modified file 'debian/glance-common.postinst'
33--- debian/glance-common.postinst 2014-03-17 13:21:04 +0000
34+++ debian/glance-common.postinst 2014-04-14 14:56:54 +0000
35@@ -16,7 +16,7 @@
36 chmod 0750 /var/log/glance
37 chown glance:glance -R /etc/glance
38 chmod 0750 /etc/glance
39- chown glance:glance /var/lib/glance
40+ find /var/lib/glance -xdev -type d -exec chown glance:glance {} \;
41 fi
42
43 #DEBHELPER#

Subscribers

People subscribed via source and target branches