summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-11 16:07:49 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-11 16:07:49 -0500
commit24a5e31f5ad96cde75315ed488b6d5a011533936 (patch)
tree3c4adc6a43a9424dab718e76d8fa66b001d81fb7 /cloudinit/distros
parentefd22ec256568b655c1dea1c61028b49b7fe04ab (diff)
downloadvyos-cloud-init-24a5e31f5ad96cde75315ed488b6d5a011533936.tar.gz
vyos-cloud-init-24a5e31f5ad96cde75315ed488b6d5a011533936.zip
minor changes use the helpers in cloudinit/net
functional
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/debian.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 24545fd4..36a844f1 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -44,14 +44,6 @@ APT_GET_WRAPPER = {
}
-def render_network_config(config, target="/"):
- version = config['version']
- config = config['config']
- ns = network_state.NetworkState(version=version, config=config)
- ns.parse_config()
- net.render_network_state(target, ns.network_state)
-
-
class Distro(distros.Distro):
hostname_conf_fn = "/etc/hostname"
locale_conf_fn = "/etc/default/locale"
@@ -87,9 +79,9 @@ class Distro(distros.Distro):
return ['all']
def _write_network_config(self, netconfig):
- # TODO: THIS IS NOT TESTED
- render_network_config(netconfig)
- return ['all']
+ ns = net.parse_net_config_data(netconfig)
+ net.render_network_state(network_state=ns, target="/")
+ return []
def _bring_up_interfaces(self, device_names):
use_all = False