diff options
author | Ryan Harper <ryan.harper@canonical.com> | 2017-03-19 08:39:01 -0500 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2017-03-20 15:59:03 -0400 |
commit | ef18b8ac4cf7e3dfd98830fbdb298380a192a0fc (patch) | |
tree | 19806d975057906806bd4e62b795e77a7a6af3c4 /systemd | |
parent | 9040e78feb7c1bcf3a1dab0ee163efaa0d21612c (diff) | |
download | cloud-init-git-ef18b8ac4cf7e3dfd98830fbdb298380a192a0fc.tar.gz |
cloudinit.net: add network config v2 parsing and rendering
Network configuration version 2 format is implemented in a package
called netplan (nplan)[1] which allows consolidated network config
for multiple network controllers.
- Add a new netplan renderer
- Update default policy, placing eni and sysconfig first
This requires explicit policy to enable netplan over eni
on systems which have both (Yakkety, Zesty, UC16)
- Allow any network state (parsed from any format cloud-init supports) to
render to v2 if system supports netplan.
- Move eni's _subnet_is_ipv6 to common code for use by other renderers
- Make sysconfig renderer always emit /etc/syconfig/network configuration
- Update cloud-init.service systemd unit to also wait on
systemd-networkd-wait-online.service
1. https://lists.ubuntu.com/archives/ubuntu-devel/2016-July/039464.html
Diffstat (limited to 'systemd')
-rw-r--r-- | systemd/cloud-init.service | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index fb3b918c..39acc20a 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -5,6 +5,7 @@ Wants=cloud-init-local.service Wants=sshd-keygen.service Wants=sshd.service After=cloud-init-local.service +After=systemd-networkd-wait-online.service After=networking.service Before=network-online.target Before=sshd-keygen.service |