cloud-init-dev team mailing list archive

[Jeremy Melvin <jmelvin@xxxxxxxxxx>]

Jeremy Melvin has proposed merging ~jmelvin/cloud-init:my-topic-branch2 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1583837 in cloud-init: "cc_chef fails when using omnibus installer because UrlResponse doesn't have an 'encode' method"
  https://bugs.launchpad.net/cloud-init/+bug/1583837

For more details, see:
https://code.launchpad.net/~jmelvin/cloud-init/+git/cloud-init/+merge/319612
-- 
Your team cloud init development team is requested to review the proposed merge of ~jmelvin/cloud-init:my-topic-branch2 into cloud-init:master.

diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index f6564e5..9e31c7d 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -306,7 +306,7 @@ def install_chef(cloud, chef_cfg, log):
         with util.tempdir() as tmpd:
             # Use tmpdir over tmpfile to avoid 'text file busy' on execute
             tmpf = "%s/chef-omnibus-install" % tmpd
-            util.write_file(tmpf, content, mode=0o700)
+            response = url_helper.readurl(url=url, retries=retries)
             util.subp([tmpf], capture=False)
     else:
         log.warn("Unknown chef install type '%s'", install_type)