summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorChad Smith <chad.smith@canonical.com>2019-12-02 16:24:18 -0700
committerGitHub <noreply@github.com>2019-12-02 16:24:18 -0700
commitf69d33a723b805fec3ee70c3a6127c8cadcb02d8 (patch)
tree5cd3ed55526a461b3581a2ddeec7853ae766e6ea /cloudinit/util.py
parentf1a73f54fab7a0aef8adc67d49a07c5a26f9f875 (diff)
downloadvyos-cloud-init-f69d33a723b805fec3ee70c3a6127c8cadcb02d8.tar.gz
vyos-cloud-init-f69d33a723b805fec3ee70c3a6127c8cadcb02d8.zip
url_helper: read_file_or_url should pass headers param into readurl (#66)
Headers param was accidentally omitted and no longer passed through to readurl due to a previous commit. To avoid this omission of params in the future, drop positional param definitions from read_file_or_url and pass all kwargs through to readurl when we are not operating on a file. In util:read_seeded, correct the case where invalid positional param file_retries was being passed into read_file_or_url. Also drop duplicated file:// prefix addition from read_seeded because read_file_or_url does that work anyway. LP: #1854084
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 78b6a2d0..9d9d5c72 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -986,13 +986,6 @@ def load_yaml(blob, default=None, allowed=(dict,)):
def read_seeded(base="", ext="", timeout=5, retries=10, file_retries=0):
- if base.startswith("/"):
- base = "file://%s" % base
-
- # default retries for file is 0. for network is 10
- if base.startswith("file://"):
- retries = file_retries
-
if base.find("%s") >= 0:
ud_url = base % ("user-data" + ext)
md_url = base % ("meta-data" + ext)
@@ -1000,14 +993,14 @@ def read_seeded(base="", ext="", timeout=5, retries=10, file_retries=0):
ud_url = "%s%s%s" % (base, "user-data", ext)
md_url = "%s%s%s" % (base, "meta-data", ext)
- md_resp = url_helper.read_file_or_url(md_url, timeout, retries,
- file_retries)
+ md_resp = url_helper.read_file_or_url(md_url, timeout=timeout,
+ retries=retries)
md = None
if md_resp.ok():
md = load_yaml(decode_binary(md_resp.contents), default={})
- ud_resp = url_helper.read_file_or_url(ud_url, timeout, retries,
- file_retries)
+ ud_resp = url_helper.read_file_or_url(ud_url, timeout=timeout,
+ retries=retries)
ud = None
if ud_resp.ok():
ud = ud_resp.contents