curtin

Merge lp://staging/~wesley-wiedenmeier/curtin/trunk.passthrough-netconfig into lp://staging/~raharper/curtin/trunk.passthrough-netconfig

trunk.passthrough-netconfig
Merge into trunk.passthrough-netconfig

Proposed by Wesley Wiedenmeier on 2017-02-17

Status:

Merged

Merge reported by:

Ryan Harper

Merged at revision:

not available

Proposed branch:

lp://staging/~wesley-wiedenmeier/curtin/trunk.passthrough-netconfig

Merge into:

lp://staging/~raharper/curtin/trunk.passthrough-netconfig

Diff against target:

692 lines (+481/-63)

8 files modified

curtin/commands/apply_net.py (+7/-2)
curtin/commands/curthooks.py (+95/-42)
curtin/net/__init__.py (+25/-0)
examples/tests/network_v2_passthrough.yaml (+18/-0)
tests/unittests/test_commands_apply_net.py (+109/-4)
tests/unittests/test_curthooks.py (+181/-0)
tests/vmtests/__init__.py (+24/-15)
tests/vmtests/test_network_passthrough.py (+22/-0)

To merge this branch:

bzr merge lp://staging/~wesley-wiedenmeier/curtin/trunk.passthrough-netconfig

Related bugs:

Bug #1665954: Detection of network deps in curthooks does not handle v2 netconfig	Undecided	In Progress
Bug #1665962: Curthooks should run system_upgrade before apply_net to allow upgrading cloud-init before detecting passthrough support	Undecided	Fix Released
Bug #1666058: vmtests attempt to parse v2 netconfig using curtin.net, even through it is not supported	Undecided	In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ryan Harper		2017-02-17	Pending
Review via email: mp+317691@code.staging.launchpad.net

Description of the change

Update network config passthrough handling to support v2 netconfig:

- Update passthrough detect behavior:
   - If 'passthrough: true' specified in config, use passthrough
   - If 'passthrough' not in config and v1 netconfig, detect if in-target
     cloud-init supports passthrough, use if available
   - If 'passthrough' not in config and v2 netconfig, detect if in-target
     cloud-init supports passthrough and v2 networking, use if available.
     Even if curtin cannot handle a v2 netconfig, it is better to fail
     installation than to use passthrough to a cloud-init that does not
     support v2 netconfig as that will be a more silent failure.
   - If 'passthrough: false' specified in config, do not use passthrough
- Add additional unit tests for passthrough behavior
- Move system_upgrade curthook to before apply_networking (LP: #1665962)
- Add a basic netconfig v2 passthrough vmtest
- Temporarily fix (LP: #1666058) using required_net_ifaces attr in vmtests
- Refactor curthooks.install_missing_packages (LP: #1665954):
   - Move logic for detecting custom config package requirements from
     install_missing_packages to detect_required_packages, as this logic may
     be useful in general
   - Extend requirement detection logic to handle v2 network config
   - Add unittests for curthooks.detect_required_packages

Revision history for this message

Wesley Wiedenmeier (wesley-wiedenmeier) wrote on 2017-02-24:

This should be almost ready to merge. The vmtest for v2 netconfig passthrough currently is using a build of cloud-init with feature flag support in my ppa. Once the cloud-init feature flags are merged in: https://code.launchpad.net/~wesley-wiedenmeier/cloud-init/+git/cloud-init/+merge/317589 we should probably switch it to a build of the netconfig-v2-passthrough devel branch in a ppa under one of the qa accounts.