diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-11-01 22:50:07 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2018-11-01 22:50:07 +0000 |
| commit | 58476e719bad7dbe1f0bd09a61ff484ad17d8e55 (patch) | |
| tree | eacf654bee7736fcccd8eff2bdf05648587ee942 /cloudinit/sources | |
| parent | 907395104bb5850d221924365102cc5ab0eca2f1 (diff) | |
| download | vyos-cloud-init-58476e719bad7dbe1f0bd09a61ff484ad17d8e55.tar.gz vyos-cloud-init-58476e719bad7dbe1f0bd09a61ff484ad17d8e55.zip | |
azure: remove /etc/netplan/90-hotplug-azure.yaml when net from IMDS
There was a typo in the seeded filename s/azure-hotplug/hotplug-azure/.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index 8642915e..7bdd43d8 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -57,7 +57,7 @@ IMDS_URL = "http://169.254.169.254/metadata/" # List of static scripts and network config artifacts created by # stock ubuntu suported images. UBUNTU_EXTENDED_NETWORK_SCRIPTS = [ - '/etc/netplan/90-azure-hotplug.yaml', + '/etc/netplan/90-hotplug-azure.yaml', '/usr/local/sbin/ephemeral_eth.sh', '/etc/udev/rules.d/10-net-device-added.rules', '/run/network/interfaces.ephemeral.d', @@ -1211,7 +1211,7 @@ def maybe_remove_ubuntu_network_config_scripts(paths=None): additional interfaces which get attached by a customer at some point after initial boot. Since the Azure datasource can now regenerate network configuration as metadata reports these new devices, we no longer - want the udev rules or netplan's 90-azure-hotplug.yaml to configure + want the udev rules or netplan's 90-hotplug-azure.yaml to configure networking on eth1 or greater as it might collide with cloud-init's configuration. |