← Back to branch summary

~openstack-charmers-next/charms/xenial/ceph-mon/trunk

« back to all changes in this revision

Viewing changes to hooks/ceph_hooks.py

  • Committer: Corey Bryant
  • Date: 2015-11-02 22:07:46 UTC
  • mfrom: (120.1.3 trunk)
  • Revision ID: corey.bryant@canonical.com-20151102220746-nlb7f7lb9igqlu13
[james-pages,r=corey.bryant] Add tox support for lint and unit tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/ceph_hooks.py
146
146
        umount(e_mountpoint)
147
147
 
148
148
    osd_journal = config('osd-journal')
149
 
    if (osd_journal and not os.path.exists(JOURNAL_ZAPPED)
150
 
            and os.path.exists(osd_journal)):
 
149
    if (osd_journal and not os.path.exists(JOURNAL_ZAPPED) and
 
150
            os.path.exists(osd_journal)):
151
151
        ceph.zap_disk(osd_journal)
152
152
        with open(JOURNAL_ZAPPED, 'w') as zapped:
153
153
            zapped.write('DONE')