summaryrefslogtreecommitdiff
path: root/cloudinit/user_data.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/user_data.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/user_data.py')
-rw-r--r--cloudinit/user_data.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index ed83d2d8..15af1daf 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -224,7 +224,7 @@ class UserDataProcessor(object):
content = util.load_file(include_once_fn)
else:
try:
- resp = read_file_or_url(include_url,
+ resp = read_file_or_url(include_url, timeout=5, retries=10,
ssl_details=self.ssl_details)
if include_once_on and resp.ok():
util.write_file(include_once_fn, resp.contents,