summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-04-06 14:30:02 -0400
committerScott Moser <smoser@ubuntu.com>2016-04-06 14:30:02 -0400
commit822ac18bc98dee35c805bf238f6bf0a1543a39dc (patch)
tree4170307285b8f6ce5563ac3c8b8dbf2a71b3087e /cloudinit
parentd75a912fb375afbab055db3178966d1f83b44143 (diff)
parent2fd22530737468a00bfb58eed9b6e231aa6d6652 (diff)
downloadvyos-cloud-init-822ac18bc98dee35c805bf238f6bf0a1543a39dc.tar.gz
vyos-cloud-init-822ac18bc98dee35c805bf238f6bf0a1543a39dc.zip
Ensure that a resolve conf object is written as a string.
Instead of passing the raw object and expecting the write_file to work automatically make sure we explicitly pass the string version of it so that the write_file routine can correctly encode/decode it as needed. LP: #1479988
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/distros/rhel_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/distros/rhel_util.py b/cloudinit/distros/rhel_util.py
index 84aad623..903d7793 100644
--- a/cloudinit/distros/rhel_util.py
+++ b/cloudinit/distros/rhel_util.py
@@ -86,4 +86,4 @@ def update_resolve_conf_file(fn, dns_servers, search_servers):
r_conf.add_search_domain(s)
except ValueError:
util.logexc(LOG, "Failed at adding search domain %s", s)
- util.write_file(fn, r_conf, 0o644)
+ util.write_file(fn, str(r_conf), 0o644)