Juju Charms Collection
ceph package

Merge lp:~tribaal/charms/trusty/ceph/ceph-zap-fix into lp:~openstack-charmers-archive/charms/trusty/ceph/next

  1. Trusty Tahr (14.04)
  2. ceph-zap-fix
  3. Merge into next
Proposed by Chris Glass
Status: Merged
Merged at revision: 113
Proposed branch: lp:~tribaal/charms/trusty/ceph/ceph-zap-fix
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 16 lines (+3/-2)
1 file modified
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
To merge this branch: bzr merge lp:~tribaal/charms/trusty/ceph/ceph-zap-fix
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+267309@code.launchpad.net

Description of the change

Patching in changes form https://code.launchpad.net/~james-page/charm-helpers/lp-1475247/+merge/265125

The ceph disk zapping fails sometimes when issued in a single command, as described in https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b

This branche's purpose is to avoid a full charmhelpers sync before release.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7077 ceph-next for tribaal mp267309
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7077/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7641 ceph-next for tribaal mp267309
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7641/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7642 ceph-next for tribaal mp267309
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7642/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7078 ceph-next for tribaal mp267309
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7078/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5654 ceph-next for tribaal mp267309
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5654/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5656 ceph-next for tribaal mp267309
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5656/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
2--- hooks/charmhelpers/contrib/storage/linux/utils.py 2015-07-29 10:48:21 +0000
3+++ hooks/charmhelpers/contrib/storage/linux/utils.py 2015-08-07 09:20:25 +0000
4@@ -43,9 +43,10 @@
5
6 :param block_device: str: Full path of block device to clean.
7 '''
8+ # https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b
9 # sometimes sgdisk exits non-zero; this is OK, dd will clean up
10- call(['sgdisk', '--zap-all', '--mbrtogpt',
11- '--clear', block_device])
12+ call(['sgdisk', '--zap-all', '--', block_device])
13+ call(['sgdisk', '--clear', '--mbrtogpt', '--', block_device])
14 dev_end = check_output(['blockdev', '--getsz',
15 block_device]).decode('UTF-8')
16 gpt_end = int(dev_end.split()[0]) - 100

Subscribers

People subscribed via source and target branches