cc_growpart: prefer growpart over parted 'resizepart'

the resizepart code was not functional.
We will re-favor it later under bug 1212492.

For now, we'll just favor the 'growpart' resizer.
Both will be found in Ubuntu cloud images.

LP: #1212444

2 files changed, 7 insertions, 2 deletions

diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py
index ba6c58af..2d54aabf 100644
--- a/cloudinit/config/cc_growpart.py
+++ b/cloudinit/config/cc_growpart.py
@@ -96,7 +96,7 @@ class ResizeParted(object):
     def resize(self, diskdev, partnum, partdev):
         before = get_size(partdev)
         try:
-            util.subp(["parted", "resizepart", diskdev, partnum])
+            util.subp(["parted", diskdev, "resizepart", partnum])
         except util.ProcessExecutionError as e:
             raise ResizeFailedException(e)
 
@@ -272,4 +272,6 @@ def handle(_name, cfg, _cloud, log, _args):
         else:
             log.debug("'%s' %s: %s" % (entry, action, msg))
 
-RESIZERS = (('parted', ResizeParted), ('growpart', ResizeGrowPart))
+# LP: 1212444 FIXME re-order and favor ResizeParted
+#RESIZERS = (('growpart', ResizeGrowPart),)
+RESIZERS = (('growpart', ResizeGrowPart), ('parted', ResizeParted))
diff --git a/tests/unittests/test_handler/test_handler_growpart.py b/tests/unittests/test_handler/test_handler_growpart.py
index b1b872b0..c0497e08 100644
--- a/tests/unittests/test_handler/test_handler_growpart.py
+++ b/tests/unittests/test_handler/test_handler_growpart.py
@@ -9,6 +9,7 @@ import errno
 import logging
 import os
 import re
+import unittest
 
 # growpart:
 #   mode: auto  # off, on, auto, 'growpart', 'parted'
@@ -121,6 +122,7 @@ class TestConfig(MockerTestCase):
         # Order must be correct
         self.mocker.order()
 
+    @unittest.skip("until LP: #1212444 fixed")
     def test_no_resizers_auto_is_fine(self):
         subp = self.mocker.replace(util.subp, passthrough=False)
         subp(['parted', '--help'], env={'LANG': 'C'})
@@ -142,6 +144,7 @@ class TestConfig(MockerTestCase):
         self.assertRaises(ValueError, self.handle, self.name, config,
                           self.cloud_init, self.log, self.args)
 
+    @unittest.skip("until LP: #1212444 fixed")
     def test_mode_auto_prefers_parted(self):
         subp = self.mocker.replace(util.subp, passthrough=False)
         subp(['parted', '--help'], env={'LANG': 'C'})