Merge ~jmelvin/cloud-init:my-topic-branch2 into cloud-init:master

[Jeremy Melvin]

Fix chef config module in omnibus install.

  Omnibus installation of chef was broken.
  LP: #1583837

[Jeremy Melvin (jmelvin)]

Fix chef config module in omnibus install.

  Omnibus installation of chef was broken.
  LP: #1583837

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:429b168188dc8e5c14c83b56d6ad4cd138d5d966
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jmelvin/cloud-init/+git/cloud-init/+merge/319612/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/100/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/100/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/100/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/100/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/100/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/100/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/100/rebuild

review: Needs Fixing (continuous-integration)

891554b... by Jeremy Melvin <email address hidden> on 2017-03-13

Fix chef config module in omnibus install.

  Omnibus installation of chef was broken.
  LP: #1583837

38aee16... by Jeremy Melvin <email address hidden> on 2017-03-13

Fix chef config module in omnibus install.

  Omnibus installation of chef was broken.
  LP: #1583837

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:38aee165072e4084988703cc866293c4414d8300
https://jenkins.ubuntu.com/server/job/cloud-init-ci/110/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/110
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/110
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/110
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/110
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/110

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/110/rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index f6564e5..2be2532 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