summaryrefslogtreecommitdiff
path: root/cloudinit/net/__init__.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-10 16:42:27 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-10 16:42:27 -0500
commit098d05b2f1253ba0808772851a1a8e85cb0108a9 (patch)
treed1f2623ab5420561756f0d98088bdc0910ec8f2f /cloudinit/net/__init__.py
parent7479ffefc3c31805e2b96b94852610dd7211e8a8 (diff)
downloadvyos-cloud-init-098d05b2f1253ba0808772851a1a8e85cb0108a9.tar.gz
vyos-cloud-init-098d05b2f1253ba0808772851a1a8e85cb0108a9.zip
adjust net to fit with cloudinit
at this point, this works: python -m cloudinit.net.network_state examples/network-all.yaml
Diffstat (limited to 'cloudinit/net/__init__.py')
-rw-r--r--cloudinit/net/__init__.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py
index e5ca050e..3cf99604 100644
--- a/cloudinit/net/__init__.py
+++ b/cloudinit/net/__init__.py
@@ -21,12 +21,13 @@ import glob
import os
import re
-from curtin.log import LOG
-from curtin.udev import generate_udev_rule
-import curtin.util as util
-import curtin.config as config
+from cloudinit import log as logging
+from cloudinit import util
+from .udev import generate_udev_rule
from . import network_state
+LOG = logging.getLogger(__name__)
+
SYS_CLASS_NET = "/sys/class/net/"
NET_CONFIG_OPTIONS = [
@@ -272,7 +273,7 @@ def parse_net_config(path):
"""Parses a curtin network configuration file and
return network state"""
ns = None
- net_config = config.load_config(path)
+ net_config = util.read_conf(path)
if 'network' in net_config:
ns = parse_net_config_data(net_config.get('network'))