diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-09-20 09:08:37 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2018-09-20 09:08:37 +0000 |
| commit | c3680475f9c97028d75a8f1bb58139ddd47d00ed (patch) | |
| tree | ef061ca4a492bc60b499eeba851eb25c6788cad6 /cloudinit/sources | |
| parent | 98d18c31c8759add858096dea53bc093c7cc9caa (diff) | |
| download | vyos-cloud-init-c3680475f9c97028d75a8f1bb58139ddd47d00ed.tar.gz vyos-cloud-init-c3680475f9c97028d75a8f1bb58139ddd47d00ed.zip | |
Remove dead-code _write_network distro implementations.
Any distro that has a '_write_nework_config' method should no
longer get their _write_network called at all. So lets drop
that code and raise a RuntimeError any time we got there.
Replace the one caller of 'apply_network' (legacy openstack path)
with a call to apply_network_config after converting the ENI to
network config.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 4cb28977..664dc4b7 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -196,7 +196,7 @@ def on_first_boot(data, distro=None, network=True): net_conf = data.get("network_config", '') if net_conf and distro: LOG.warning("Updating network interfaces from config drive") - distro.apply_network(net_conf) + distro.apply_network_config(eni.convert_eni_data(net_conf)) write_injected_files(data.get('files')) |