diff options
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/debian.py | 3 | ||||
| -rw-r--r-- | cloudinit/distros/rhel.py | 28 |
2 files changed, 28 insertions, 3 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index da27f780..5b4aa9f8 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -67,8 +67,7 @@ class Distro(distros.Distro): def _write_hostname(self, hostname, out_fn): # "" gives trailing newline. - lines = ["# Created by cloud-init", str(hostname), ""] - util.write_file(out_fn, '\n'.join(lines), 0644) + util.write_file(out_fn, "%s\n" % str(hostname), 0644) def update_hostname(self, hostname, prev_fn): hostname_prev = self._read_hostname(prev_fn) diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index d81ee5fb..ec4dc2cc 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -68,12 +68,26 @@ class Distro(distros.Distro): def install_packages(self, pkglist): self.package_command('install', pkglist) + def _write_resolve(self, dns_servers, search_servers): + contents = [] + if dns_servers: + for s in dns_servers: + contents.append("nameserver %s" % (s)) + if search_servers: + contents.append("search %s" % (" ".join(search_servers))) + if contents: + resolve_rw_fn = self._paths.join(False, "/etc/resolv.conf") + contents.insert(0, '# Created by cloud-init') + util.write_file(resolve_rw_fn, "\n".join(contents), 0644) + def _write_network(self, settings): # TODO(harlowja) fix this... since this is the ubuntu format entries = translate_network(settings) LOG.debug("Translated ubuntu style network settings %s into %s", settings, entries) # Make the intermediate format as the rhel format... + nameservers = [] + searchservers = [] for (dev, info) in entries.iteritems(): net_fn = NETWORK_FN_TPL % (dev) net_ro_fn = self._paths.join(True, net_fn) @@ -102,11 +116,17 @@ class Distro(distros.Distro): if mac_addr: net_cfg["MACADDR"] = mac_addr lines = net_cfg.write() + if 'dns-nameservers' in info: + nameservers.extend(info['dns-nameservers']) + if 'dns-search' in info: + searchservers.extend(info['dns-search']) if not prev_exist: lines.insert(0, '# Created by cloud-init') w_contents = "\n".join(lines) net_rw_fn = self._paths.join(False, net_fn) util.write_file(net_rw_fn, w_contents, 0644) + if nameservers or searchservers: + self._write_resolve(nameservers, searchservers) def set_hostname(self, hostname): out_fn = self._paths.join(False, '/etc/sysconfig/network') @@ -208,7 +228,7 @@ class Distro(distros.Distro): def update_package_sources(self): self._runner.run("update-sources", self.package_command, - ["update"], freq=PER_INSTANCE) + ["makecache"], freq=PER_INSTANCE) # This class helps adjust the configobj @@ -314,6 +334,12 @@ def translate_network(settings): val = info[k].strip().lower() if val: iface_info[k] = val + # Name server info provided?? + if 'dns-nameservers' in info: + iface_info['dns-nameservers'] = info['dns-nameservers'].split() + # Name server search info provided?? + if 'dns-search' in info: + iface_info['dns-search'] = info['dns-search'].split() # Is any mac address spoofing going on?? if 'hwaddress' in info: hw_info = info['hwaddress'].lower().strip() |