Merge lp:~james-page/charm-helpers/ceph-fix-zap into lp:charm-helpers

[James Page]

Add --clear to sgdisk args to ensure that disks are actually zapped.

This is inline with ceph-disk upstream in Ceph.

[Ryan Harper (raharper)]

I've successfully deployed the precise ceph charm now with this change in place.

review: Approve

[Marco Ceppi (marcoceppi)]

Lgtm, +1

review: Approve

[Matt Bruzek (mbruzek)]

+1 LGTM According to the man page: http://manpages.ubuntu.com/manpages/natty/man8/sgdisk.8.html That option clears out all the partition data.

=== modified file 'charmhelpers/contrib/storage/linux/utils.py'
--- charmhelpers/contrib/storage/linux/utils.py	2013-12-09 10:59:08 +0000
+++ charmhelpers/contrib/storage/linux/utils.py	2014-03-05 20:47:15 +0000
@@ -22,4 +22,5 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', '--mbrtogpt', block_device])
+    check_call(['sgdisk', '--zap-all', '--clear',
+                '--mbrtogpt', block_device])

=== modified file 'tests/contrib/storage/test_linux_storage_utils.py'
--- tests/contrib/storage/test_linux_storage_utils.py	2013-12-09 14:08:55 +0000
+++ tests/contrib/storage/test_linux_storage_utils.py	2014-03-05 20:47:15 +0000
@@ -12,8 +12,8 @@
         '''It calls sgdisk correctly to zap disk'''
         with patch(STORAGE_LINUX_UTILS + '.check_call') as check_call:
             storage_utils.zap_disk('/dev/foo')
-            check_call.assert_called_with(['sgdisk', '--zap-all', '--mbrtogpt',
-                                           '/dev/foo'])
+            check_call.assert_called_with(['sgdisk', '--zap-all', '--clear',
+                                           '--mbrtogpt', '/dev/foo'])
 
     @patch(STORAGE_LINUX_UTILS + '.stat')
     @patch(STORAGE_LINUX_UTILS + '.S_ISBLK')