Merge ~jibel/curtin/+git/lp_1823682:lp_1823682 into curtin:master

[Jean-Baptiste Lallement]

zfs: pass pool and fs properties to zpool_create

block-meta use of zpool_create did not supply the optional parameters
that are supported in the zfs/zpool configuration dictionary. Fix
this by extracting the values from the config and passing them
to zpool_create.

LP: #1823682

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:616945abe0d094801eeb4f5dc8c73995335a0788
https://jenkins.ubuntu.com/server/job/curtin-ci/1216/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1216
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1216
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1216
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1216

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1216/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Thanks for finding this!

review: Approve

diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index b108aca..79493fc 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -1455,6 +1455,8 @@ def zpool_handler(info, storage_config):
              for v in info.get('vdevs', [])]
     poolname = info.get('pool')
     mountpoint = info.get('mountpoint')
+    pool_properties = info.get('pool_properties', {})
+    fs_properties = info.get('fs_properties', {})
     altroot = state['target']
 
     if not vdevs or not poolname:
@@ -1474,7 +1476,9 @@ def zpool_handler(info, storage_config):
 
     LOG.info('Creating zpool %s with vdevs %s', poolname, vdevs_byid)
     zfs.zpool_create(poolname, vdevs_byid,
-                     mountpoint=mountpoint, altroot=altroot)
+                     mountpoint=mountpoint, altroot=altroot,
+                     pool_properties=pool_properties,
+                     zfs_properties=fs_properties)
 
 
 def zfs_handler(info, storage_config):
diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index 20f0d87..b4a9afa 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -339,15 +339,20 @@ class TestZpoolHandler(CiTestCase):
                                                            m_zfs):
         storage_config = OrderedDict()
         info = {'type': 'zpool', 'id': 'myrootfs_zfsroot_pool',
-                'pool': 'rpool', 'vdevs': ['disk1p1'], 'mountpoint': '/'}
+                'pool': 'rpool', 'vdevs': ['disk1p1'], 'mountpoint': '/',
+                'pool_properties': {'ashift': 42},
+                'fs_properties': {'compression': 'lz4'}}
         disk_path = "/wark/mydev"
         m_getpath.return_value = disk_path
         m_block.disk_to_byid_path.return_value = None
         m_util.load_command_environment.return_value = {'target': 'mytarget'}
         block_meta.zpool_handler(info, storage_config)
-        m_zfs.zpool_create.assert_called_with(info['pool'], [disk_path],
-                                              mountpoint="/",
-                                              altroot="mytarget")
+        m_zfs.zpool_create.assert_called_with(
+            info['pool'], [disk_path],
+            mountpoint="/",
+            altroot="mytarget",
+            pool_properties={'ashift': 42},
+            zfs_properties={'compression': 'lz4'})
 
 
 class TestZFSRootUpdates(CiTestCase):