Merge ~mwhudson/curtin:fba-dasd into curtin:master

[Michael Hudson-Doyle]

storage_config: handle some FBA dasd oddities

The storage_config handling of dasds only accounted for ECKD
dasds. FBA dasds need different handling -- in many ways they are
more like a regular disk (that can only be formatted with a DOS
partition table, but this code doesn't need to handle that), but
the kernel creates a magic fake partition for a FBA dasd with no
DOS partition table and we want to pretend that doesn't exist.

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

FAILED: Continuous integration, rev:c96c396a0988c5bd78aff5327ca74ea68fb071b7
https://jenkins.ubuntu.com/server/job/curtin-ci/29/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/29/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/29/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/29/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/29/

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:1af21bb3188a4b1891ef0da6c7a68f0e52cb1726
https://jenkins.ubuntu.com/server/job/curtin-ci/31/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/31/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/31/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/31/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/31/

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

review: Approve (continuous-integration)

[Paride Legovini (paride)]

LGTM

review: Approve (lightweight)

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

Commit message lints:
- Line #2 has 309 too many characters. Line starts with: "The storage_config handling"...

review: Needs Fixing

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

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/23/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/23/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/23/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/23/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/23/

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

diff --git a/curtin/storage_config.py b/curtin/storage_config.py
index 494b142..96d208f 100644
--- a/curtin/storage_config.py
+++ b/curtin/storage_config.py
@@ -768,17 +768,20 @@ class BlockdevParser(ProbertParser):
             # set wwn, serial, and path
             entry.update(uniq_ids)
 
-            # disk entry for dasds needs device_id and check for vtoc ptable
-            if devname.startswith('/dev/dasd'):
+            # disk entry for ECKD dasds needs device_id and check for vtoc
+            # ptable
+            dasd_config = self.probe_data.get('dasd', {}).get(devname)
+            if dasd_config is not None and \
+               dasd_config.get('type', 'ECKD') == 'ECKD':
                 device_id = (
                     blockdev_data.get('ID_PATH', '').replace('ccw-', ''))
                 if device_id:
                     entry['device_id'] = device_id
 
                 # if dasd has been formatted, attrs.size is non-zero
-                # formatted dasds have ptable type of 'vtoc'
-                dasd_size = blockdev_data.get('attrs', {}).get('size')
-                if dasd_size and dasd_size != "0":
+                # formatted ECKD dasds have ptable type of 'vtoc'
+                dasd_size = blockdev_data.get('attrs', {}).get('size', "0")
+                if dasd_size != "0":
                     entry['ptable'] = 'vtoc'
 
             if 'ID_PART_TABLE_TYPE' in blockdev_data:
@@ -794,6 +797,13 @@ class BlockdevParser(ProbertParser):
             entry['number'] = int(attrs['partition'])
             parent_devname = self.partition_parent_devname(blockdev_data)
             parent_blockdev = self.blockdev_data[parent_devname]
+            if 'ID_PART_TABLE_TYPE' not in parent_blockdev:
+                # Exclude the fake partition that the kernel creates
+                # for an otherwise unformatted FBA dasd.
+                dasds = self.probe_data.get('dasd', {})
+                dasd_config = dasds.get(parent_devname, {})
+                if dasd_config.get('type', 'ECKD') == 'FBA':
+                    return None
             ptable = parent_blockdev.get('partitiontable')
             if ptable:
                 part = None