diff options
| -rw-r--r-- | cloudinit/net/cmdline.py (renamed from cloudinit/net/klibc.py) | 0 | ||||
| -rw-r--r-- | cloudinit/net/renderers/__init__.py (renamed from cloudinit/net/distros/__init__.py) | 0 | ||||
| -rw-r--r-- | cloudinit/net/renderers/eni.py (renamed from cloudinit/net/distros/debian.py) | 6 | ||||
| -rw-r--r-- | cloudinit/stages.py | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/cloudinit/net/klibc.py b/cloudinit/net/cmdline.py index 958c264b..958c264b 100644 --- a/cloudinit/net/klibc.py +++ b/cloudinit/net/cmdline.py diff --git a/cloudinit/net/distros/__init__.py b/cloudinit/net/renderers/__init__.py index e69de29b..e69de29b 100644 --- a/cloudinit/net/distros/__init__.py +++ b/cloudinit/net/renderers/__init__.py diff --git a/cloudinit/net/distros/debian.py b/cloudinit/net/renderers/eni.py index 4bf34fd7..b427012e 100644 --- a/cloudinit/net/distros/debian.py +++ b/cloudinit/net/renderers/eni.py @@ -241,12 +241,10 @@ def _parse_deb_config(path): class Renderer(object): - """Renders network information in a debian format.""" + """Renders network information in a /etc/network/interfaces format.""" def render_persistent_net(self, network_state): - ''' Given state, emit udev rules to map - mac to ifname - ''' + """Given state, emit udev rules to map mac to ifname.""" content = "" interfaces = network_state.get('interfaces') for iface in interfaces.values(): diff --git a/cloudinit/stages.py b/cloudinit/stages.py index e6bd34fe..1112bf0d 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -43,7 +43,7 @@ from cloudinit import distros from cloudinit import helpers from cloudinit import importer from cloudinit import log as logging -from cloudinit.net import klibc +from cloudinit.net import cmdline from cloudinit import sources from cloudinit import type_utils from cloudinit import util @@ -579,7 +579,7 @@ class Init(object): if os.path.exists(disable_file): return (None, disable_file) - cmdline_cfg = ('cmdline', klibc.read_kernel_cmdline_config()) + cmdline_cfg = ('cmdline', cmdline.read_kernel_cmdline_config()) dscfg = ('ds', None) if self.datasource and hasattr(self.datasource, 'network_config'): dscfg = ('ds', self.datasource.network_config) |