lp://staging/~smoser/curtin/trunk.1592149
- Get this branch:
- bzr branch lp://staging/~smoser/curtin/trunk.1592149
Branch merges
- Ryan Harper (community): Approve
- Server Team CI bot: Approve (continuous-integration)
-
Diff: 124 lines (+44/-28)2 files modifiedcurtin/commands/net_meta.py (+39/-28)
curtin/net/__init__.py (+5/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 391. By Scott Moser
-
improve net-meta network configuration
when network configuration is not provided 'net-meta' would write
a very simplistic /etc/network/interfaces file for each of the
devices that were brought up in install environment. This had the following
issues
a.) it did not disable cloud-init networking
b.) it did not account for naming of devices (causing issue if
devices changed names between install and boot environment).
c.) did not include interfaces.d as ideally it would. - 390. By Ryan Harper
-
curtin/net: fix inet value for subnets, don't add interface attributes to alias
Apply two separate fixes for configuring bonding with ip aliases.
Curtin re-used the interface's inet value for each subnet that might
be configured. In the case where the configuration included an ipv4
address after an ipv6 one resulted in emitting 'inet6' for ipv4 address
which is not correct. Resolve this issue by calculating the inet
value independent of the current status of the iface, using the subnet
config instead.When rendering a network_config which includes ip alias interfaces
do not emit any attributes, like MTU, or bond/bridge options Including
these values is almost always wrong or will result in confusing
behavior on the target system. - 389. By Ryan Harper
-
Detect and remove legacy /etc/network/
interfaces. d/eth0. cfg from target Prior to Xenial release, Ubuntu Cloud images included a default network
configuration in /etc/network/interfaces. d/eth0. conf. The presence of
this legacy configuration file can cause a delay during boot when cloud-
init is expecting a non-existent interface to become available. curtin
installations handle configuring networking in the target installed
system subsequently the embedded configuration is not needed.This patch reuses most of cloud-init's version of detecting and
examining the legacy config, confirming if the contents are what is
expected. Upon finding expected content the file will be removed,
otherwise it will remain.Additional changes to vmtest and unittest were added to remove the
reliance on fallback nic naming (eth0); we always use non-kernel names
in our configuration now. An additional common test has been added to
check that in all cases we ensure we remove the embedded config. - 387. By Scott Moser
-
fix timestamp in reporting events.
If no timestamp was passed into a ReportingEvent, then the default was
used. That default was 'time.time()' which was evaluated once only at
import time. - 385. By Scott Moser
-
fix dependencies in packaging
This fixes up dependencies to be more correct.
The net result is that after 'apt-get install curtin', then
curtin --install-deps will not have any work to do.curtin-common changes:
- drop 'python' from curtin-common package as it does not use any python.
- util-linux >= 2.20.1 is in all ubuntu (precise+) so remove this
dependency as util-linux is 'essential'python-curtin, python3-curtin:
- drop 'curl' from dependencies of python-curtin or python3-curtin
this was simply incorrect. wget is used, but curl is never.
- explicitly list the python dependencies on oauthlib and yaml
the attempt to have dh_python resolve these was just simply not
working. so explicitly list them.requirements.txt:
- urllib3 is never used, drop it from here.
- pbr is not needed. (it was probably copied from cloud-init) - 384. By Ryan Harper
-
mdadm: resolve mdadm/bcache and trusty+hwe issues
- mdadm must be installed before kernel update or grub fails
- trusty bcache doesn't support sysfs entries, retry on failure
when looking for an existing cache device
- fix storage configuration where partition 'number' key was missing
causing curtin to use reuse a partition (configuration error).
- add some more debugging information when applying raid configurations
- raid: add in use of homehost to ensure we find the right mdadm devices
- unittests: fix up mdadm tests with introduced hostname -s call
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~curtin-dev/curtin/trunk