diff options
| author | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
|---|---|---|
| committer | Nate House nathan.house@rackspace.com <> | 2014-02-03 16:03:14 -0600 |
| commit | a9e4009ae7221ea167b3e1083a887564483e0350 (patch) | |
| tree | a370bd47399b1517c21b89d68aefd5afc15c5418 /cloudinit/distros/rhel.py | |
| parent | 4a0e460f18d8cbf2651286565efec1f00cbb20cd (diff) | |
| parent | 3cfe9b3d8958b1a4e450d5ff31d805c424945027 (diff) | |
| download | vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.tar.gz vyos-cloud-init-a9e4009ae7221ea167b3e1083a887564483e0350.zip | |
Fix merge conflict
Diffstat (limited to 'cloudinit/distros/rhel.py')
| -rw-r--r-- | cloudinit/distros/rhel.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 30195384..e8abf111 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -25,6 +25,7 @@ from cloudinit import helpers from cloudinit import log as logging from cloudinit import util +from cloudinit.distros import net_util from cloudinit.distros import rhel_util from cloudinit.settings import PER_INSTANCE @@ -63,7 +64,7 @@ class Distro(distros.Distro): def _write_network(self, settings): # TODO(harlowja) fix this... since this is the ubuntu format - entries = rhel_util.translate_network(settings) + entries = net_util.translate_network(settings) LOG.debug("Translated ubuntu style network settings %s into %s", settings, entries) # Make the intermediate format as the rhel format... |