Merge lp:~gabor.meszaros/charms/trusty/ceph-osd/lp1660914 into lp:charms/ceph-osd

Proposed by Gábor Mészáros
Status: Needs review
Proposed branch: lp:~gabor.meszaros/charms/trusty/ceph-osd/lp1660914
Merge into: lp:charms/ceph-osd
Diff against target: 10 lines (+2/-0)
1 file modified
hooks/ceph_hooks.py (+2/-0)
To merge this branch: bzr merge lp:~gabor.meszaros/charms/trusty/ceph-osd/lp1660914
Reviewer Review Type Date Requested Status
Chris Holcombe (community) Disapprove
Review via email: mp+316078@code.launchpad.net

Description of the change

Fix for lp1660914

To post a comment you must log in.
Revision history for this message
Chris Holcombe (xfactor973) wrote :

We don't actually use this repo for changes. Changes need to be submitted here: https://github.com/openstack/charm-ceph-osd

review: Disapprove

Unmerged revisions

107. By Gabor Meszaros <email address hidden>

fix for 1660914

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/ceph_hooks.py'
2--- hooks/ceph_hooks.py 2016-07-22 14:03:39 +0000
3+++ hooks/ceph_hooks.py 2017-02-01 09:02:34 +0000
4@@ -402,6 +402,8 @@
5 log("write zapped: {}".format(journal_devs),
6 level=DEBUG)
7 zapfile.write('\n'.join(sorted(list(journal_devs))))
8+ mkdir(os.path.dirname(JOURNAL_ZAPPED), owner=ceph.ceph_user(),
9+ group=ceph.ceph_user())
10 os.rename(tmpfile, JOURNAL_ZAPPED)
11
12

Subscribers

People subscribed via source and target branches