(mirror of https://github.com/marekm72/vyos-cloud-init.git) https://git.amelek.net/marekm72/vyos-cloud-init.git/atom?h=crux 2017-07-19T21:52:32+00:00 2017-07-19T21:52:32+00:00 Ryan Harper ryan.harper@canonical.com 2017-06-13T14:06:41+00:00 urn:sha1:dcbe479575fac9f293c5c4089f4bcb46ab887206 Under el7, cloud-init systemd files need some unit tweaks to ensure they run at the right time. Pull in current el7 downstream systemd unit changes. 2017-03-20T19:59:03+00:00 Ryan Harper ryan.harper@canonical.com 2017-03-19T13:39:01+00:00 urn:sha1:ef18b8ac4cf7e3dfd98830fbdb298380a192a0fc 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 2016-11-15T22:17:59+00:00 Scott Moser smoser@brickies.net 2016-11-15T22:02:34+00:00 urn:sha1:b6561a134936ba48eaccc447c3fe2526f0b84bb9 cloud-init.service cannot currently run After=systemd-networkd-wait-online.service as systemd-networkd.service is After dbus.service, but cloud-init.service is: Before=sysinit.target and sysinit.target is before dbus.service. The result is that we are temporarily preferring for cases where there is systemd-networkd in place to have cloud-init.service run without networking properly configured. See bug 1636912 for more information. 2016-11-10T22:09:29+00:00 Scott Moser smoser@brickies.net 2016-11-10T15:49:17+00:00 urn:sha1:bf4010a9c379e2109b030af558033014f9137f47 Drop mention of local-fs.target from both cloud-init-local.service and cloud-init.service. This could actually could cause a loop in ordering due to cc_mounts writing mount points with: x-systemd.requires=cloud-init.service Rather, we specifically list /var/lib/ and systemd-remount-fs.service in cloud-init-local.service. cloud-init.service will run after cloud-init-local and thus will have these satisfied. 2016-11-10T22:09:29+00:00 Scott Moser smoser@brickies.net 2016-11-10T15:41:47+00:00 urn:sha1:f7d6bfadf4c84e702e950851e8001ee8f4e3c4b4 Here we drop the Requires=networking.service but keep the After=networking.service. The change there is that we no longer force networking.service to run, as the system may not have it or be configured to use it. Second, we add After=systemd-networkd-wait-online.service. That causes us to run after systemd-networkd has brought networking up. The end result is that we now run after both ifupdown or systemd-networkd (if they were going to run) but do not force either to run. One other change is that by dropping Requires=networking.service cloud-init will now run even if networking failed to come up. LP: #1636912 2016-11-10T22:09:29+00:00 Scott Moser smoser@brickies.net 2016-11-10T15:29:24+00:00 urn:sha1:e568aec31051674901047ee577f6e229785cbfc3 Per discussion on bug 1636912 and subsequent feedback on bug 1629797, using: Before=sysinit.target is a simpler solution than what we had implemented: Before=basic.target Before=dbus.target LP: #1629797 2016-10-07T16:28:07+00:00 Daniel Watkins daniel.watkins@canonical.com 2016-10-07T10:33:48+00:00 urn:sha1:6e45ffb21e9622780585b4fe15890f009ca8fa71 The change reported to fix bug 1629797 was incorrect. It added: Before=dbus.target and its commit message referenced dbus.service. dbus.target does not exist, and dbus.service would not solve the problem. The change did not fix the problem nor actually make any difference. The fix here is just to use Before=dbus.socket. LP: #1629797 2016-10-04T20:40:12+00:00 Scott Moser smoser@brickies.net 2016-10-04T20:40:12+00:00 urn:sha1:94fd35eeb3f53bc82fb9ddcad60c1e605890fd53 This is the best work around we have for an issue seen when dns is used during cloud-init.service on a system that is configured in nsswitch to use systemd-resolved. The problem is that cloud-init.service was blocking basic.target, and dbus would not be available until after cloud-init.service finished. LP: #1629797 2016-09-20T17:42:29+00:00 Scott Moser smoser@brickies.net 2016-09-19T15:48:54+00:00 urn:sha1:80f5ec4be0f781b26eca51d90d51abfab396b3f6 The end result of all of these changes is to get mounts managed by cloud-init to occur only after cloud-init.service is done. We need to do that so that filesystems that are set up by cloud-init (in disk_setup) do not get mounted by stale entries in /etc/fstab before the setup occurs. This can occur in 2 ways: a.) new instance with old /etc/fstab b.) same instance where disk needs adjusting (Azure resize will re-format the ephemeral disk). The list of changes here is: - move mounts and disk_setup module to cloud-init.service rather than config. cloud-init.service runs earlier in boot so it can get those mount points done earlier. - on systemd add 'x-systemd.requires=cloud-init.service' to fstab options - cloud-init-local.service: add Before=basic.target - cloud-init.service: - extend After, Before, and Wants to multiple lines rather than one long line. - sort consistently with cloud-init-local.service - add DefaultDependencies=no - add Before=default.target - add Conflicts=shutdown.target LP: #1611074 2016-03-10T15:32:08+00:00 Scott Moser smoser@ubuntu.com 2016-03-10T15:32:08+00:00 urn:sha1:2eb86ca13cb658b51440bb28cab47205b641d0ee This should mean that cloud-init-local is running earlier now (DefaultDependencies=no). And also blocking networking coming up (Before=network-pre.target) cloud-init.service should now actually block network-online.target from being made (meaning it will run before anything that expects that) but after networking.service, which is what actually does the bringup on ifupdown / ubuntu.