lp://staging/~nacc/curtin/iscsi-lp1679222

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~curtin-dev/curtin/trunk at revision 482

Server Team CI bot: Approve (continuous-integration) on 2017-04-05

Blake Rouse (community): Approve on 2017-04-04

Diff: 189 lines (+69/-21)

4 files modified

curtin/block/iscsi.py (+1/-1)
tests/unittests/test_block_iscsi.py (+48/-6)
tests/vmtests/__init__.py (+2/-2)
tools/launch (+18/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1679222: ISCSI target validation fails when target name includes a ':'

High

Fix Released

Link a bug report

Related blueprints

485. By Nish Aravamudan on 2017-04-04

vmtests: iSCSI targets can contain ':'

So we cannot use ':' as the separator for iscsi disk specifications to
tools/launch, because it becomes ambiguous and makes the code more
complicated. Instead, use '|' and special-case the `awk` delimiter if
'iscsi' is found in the disk specification to launch.

484. By Nish Aravamudan on 2017-04-04

tests/vmtests: insert a ':' into the vmtest iSCSI disks

483. By Nish Aravamudan on 2017-04-04

curtin/block/iscsi: require [] around IPv6 addresses

Currently, we do not require [] around IPv6 addresses and attempt to
parse the resulting string correctly (you can get odd misparses as in
the bug). This is clearly error-prone, so let's require that IPv6
addresses must have [] around the address part. We either allow a string
without ':' and '@' in it (and validate it is hostname or IPv4 address
later) or if [] is found we allow a string without '@' in it and
validate it is an IPv6 address.

This ends up allowing for ':' in target names which otherwise gets
mis-parsed as in LP #1679222.

Fixes: LP: #1679222.

482. By Nish Aravamudan on 2017-04-04

Add tests for LP #1679222

We fail to parse targets with ':' in them because we incorrectly
allow ':' to exist in IPv4 or hostnames when it should only exist in
IPv6 addresses.

With only this change, the testcase will fail, but this allows
verification that the fix actually fixes this issue.

481. By Joshua Powers on 2017-04-03

tests: re-enable ZestyTestMdadmBcache.

This was disabled due to bug 1667078 which is now fixed.

480. By Scott Moser on 2017-03-24

curthooks: fix pylint reported error when using ubuntu_core_curthooks.

The previous commit added code that called ubuntu_core curthooks and
then sys.exit() with its return. It would never return a value,
so this is in the end the same.

479. By Ryan Harper on 2017-03-23

Add support for installing Ubuntu-Core 16 images

UC16 images are compressed-xz raw images which need to be written
directly to disk. Introduce new source types dd-{xz,gz,bz2,raw}
and pass them to block_meta write_image_to_disk. Update block_meta's
find_root_dev to look for UC16 specific paths to identify the root
partition.

UC16 images are generally not modifiable and do not contain dpkg/apt,
therefore curtin handles curthooks on UC16 differently. Add a new
top-level 'cloudconfig' key which is modeled after write_files to be
used by maas to inject cloud-init into a UC16 image; curtin appends
these files out in the "writable" partition of UC16 which will be
mounted up on top of the root partition. Add an initial vmtest
(disabled by default) as UC16 images are not yet available via maas
streams data.

478. By Andres Rodriguez on 2017-03-21

Add 'STORAGE_CONFIG_V1_DD' to the feature list.

Adds the 'STORAGE_CONFIG_V1_DD' variable to represent that selection of
target disk can be influenced via storage config when installing a dd
image.

477. By Scott Moser on 2017-03-20

flake8: fix flake8 issues with previous merge.

Simply fix the flake8 issues with the previous commit.

476. By Andres Rodriguez on 2017-03-18

Support selection of target disk for dd images install via storage config.

If storage config is provided to a dd image installation, and one of the
disks listed includes the 'grub_drive', select that as the target for dd.