diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2016-06-06 18:42:29 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2016-06-06 18:42:29 -0700 |
| commit | f640797e342b6efbfb838a6350b312935222e992 (patch) | |
| tree | 4e893298101cf3141d80b4bf2a2d6e009462502d /cloudinit/distros | |
| parent | 85a53d66ad0241b2d6453d902487bb2edc1512b8 (diff) | |
| parent | bc9bd58d1533d996029770da758f73217c15af33 (diff) | |
| download | vyos-cloud-init-f640797e342b6efbfb838a6350b312935222e992.tar.gz vyos-cloud-init-f640797e342b6efbfb838a6350b312935222e992.zip | |
Rebase against master
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 0f222c8c..5c29c804 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -31,6 +31,7 @@ import stat from cloudinit import importer from cloudinit import log as logging +from cloudinit import net from cloudinit import ssh_util from cloudinit import type_utils from cloudinit import util @@ -128,6 +129,8 @@ class Distro(object): mirror_info=arch_info) def apply_network(self, settings, bring_up=True): + # this applies network where 'settings' is interfaces(5) style + # it is obsolete compared to apply_network_config # Write it out dev_names = self._write_network(settings) # Now try to bring them up @@ -143,6 +146,9 @@ class Distro(object): return self._bring_up_interfaces(dev_names) return False + def apply_network_config_names(self, netconfig): + net.apply_network_config_names(netconfig) + @abc.abstractmethod def apply_locale(self, locale, out_fn=None): raise NotImplementedError() |