x/cloud-init
Code Issues Proposed changes

Allow the omnibus url fetching retries to be configurable

Browse Source
This commit is contained in:
Joshua Harlow 2014-10-11 18:23:20 -07:00
parent cbb24ba690
commit 9691d100bc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudinit/config/cc_chef.py
View File

@ -37,6 +37,7 @@ CHEF_DIRS = [
] ]
OMNIBUS_URL = "https://www.opscode.com/chef/install.sh" OMNIBUS_URL = "https://www.opscode.com/chef/install.sh"
OMNIBUS_URL_RETRIES = 5
CHEF_RB_TPL_DEFAULTS = { CHEF_RB_TPL_DEFAULTS = {
# These are ruby symbols... # These are ruby symbols...
@ -199,7 +200,10 @@ def install_chef(cloud, chef_cfg, log):
elif install_type == 'omnibus': elif install_type == 'omnibus':
# This will install as a omnibus unified package # This will install as a omnibus unified package
url = util.get_cfg_option_str(chef_cfg, "omnibus_url", OMNIBUS_URL) url = util.get_cfg_option_str(chef_cfg, "omnibus_url", OMNIBUS_URL)
content = url_helper.readurl(url=url, retries=5) 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)
with util.tempdir() as tmpd: with util.tempdir() as tmpd:
# Use tmpdir over tmpfile to avoid 'text file busy' on execute # Use tmpdir over tmpfile to avoid 'text file busy' on execute
tmpf = "%s/chef-omnibus-install" % tmpd tmpf = "%s/chef-omnibus-install" % tmpd

4
cloudinit/util.py
View File

@ -399,6 +399,10 @@ def get_cfg_option_str(yobj, key, default=None):
return val return val
def get_cfg_option_int(yobj, key, default=0):
return int(get_cfg_option_str(yobj, key, default=default))
def system_info(): def system_info():
return { return {
'platform': platform.platform(), 'platform': platform.platform(),