diff options
| author | Ben Howard <bh@digitalocean.com> | 2017-04-26 14:07:53 -0600 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2017-05-19 17:14:20 -0400 |
| commit | 3d97b29bd71b9de5fb14d8bd320c20545b88a81b (patch) | |
| tree | 0a2290ecd08c1b49a69107468eae9305171c68e7 /cloudinit/sources | |
| parent | d059d480c3a5bbeb3bb2e8ff2350f85d64721c11 (diff) | |
| download | vyos-cloud-init-3d97b29bd71b9de5fb14d8bd320c20545b88a81b.tar.gz vyos-cloud-init-3d97b29bd71b9de5fb14d8bd320c20545b88a81b.zip | |
DigitalOcean: remove routes except for the public interface.
Previously, the datasource for DigitalOcean allowed for a gateway on each
NIC. As a result, on Ubuntu 16.04, networking.service was broken. For
17.04 and later, Ubuntu _replaces_ the default gateway with the second
gateway on 'ifup' after reboot.
DigitalOcean is looking at changing the meta-data, however, this will
result in another version of the meta-data JSON.
LP: #1681531.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/helpers/digitalocean.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/helpers/digitalocean.py b/cloudinit/sources/helpers/digitalocean.py index 257989e8..693f8d5c 100644 --- a/cloudinit/sources/helpers/digitalocean.py +++ b/cloudinit/sources/helpers/digitalocean.py @@ -162,7 +162,7 @@ def convert_network_configuration(config, dns_servers): continue sub_part = _get_subnet_part(raw_subnet) - if netdef in ('private', 'anchor_ipv4', 'anchor_ipv6'): + if nic_type != "public" or "anchor" in netdef: del sub_part['gateway'] subnets.append(sub_part) |