summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorJeremy Melvin <melvinj1123@gmail.com>2017-03-10 14:30:20 -0500
committerScott Moser <smoser@brickies.net>2017-03-13 13:57:26 -0400
commit482b2746b5919233afec55776d5fc996cdc2f38e (patch)
treeef4413a4ef941d4a8937bf66d9b129f8235b292e /cloudinit
parent9044a05469d1b138d4ee34c55c7f5bdb6f97164d (diff)
downloadvyos-cloud-init-482b2746b5919233afec55776d5fc996cdc2f38e.tar.gz
vyos-cloud-init-482b2746b5919233afec55776d5fc996cdc2f38e.zip
Fix chef config module in omnibus install.
Omnibus installation of chef was broken under python3. LP: #1583837
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/config/cc_chef.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index f6564e5c..2be2532c 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -302,7 +302,7 @@ def install_chef(cloud, chef_cfg, log):
retries = max(0, util.get_cfg_option_int(chef_cfg,
"omnibus_url_retries",
default=OMNIBUS_URL_RETRIES))
- content = url_helper.readurl(url=url, retries=retries)
+ content = url_helper.readurl(url=url, retries=retries).contents
with util.tempdir() as tmpd:
# Use tmpdir over tmpfile to avoid 'text file busy' on execute
tmpf = "%s/chef-omnibus-install" % tmpd