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

[Chris Glass]

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.

[James Page (james-page)]

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2015-07-29 10:48:21 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2015-08-07 09:20:25 +0000
@@ -43,9 +43,10 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
+    # https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b
     # sometimes sgdisk exits non-zero; this is OK, dd will clean up
-    call(['sgdisk', '--zap-all', '--mbrtogpt',
-          '--clear', block_device])
+    call(['sgdisk', '--zap-all', '--', block_device])
+    call(['sgdisk', '--clear', '--mbrtogpt', '--', block_device])
     dev_end = check_output(['blockdev', '--getsz',
                             block_device]).decode('UTF-8')
     gpt_end = int(dev_end.split()[0]) - 100