diff options
| author | harlowja <harlowja@virtualbox.rhel> | 2013-02-23 21:23:24 -0800 |
|---|---|---|
| committer | harlowja <harlowja@virtualbox.rhel> | 2013-02-23 21:23:24 -0800 |
| commit | eacfc7ffbec3e6a0348ed484da895e2d2fc5ba10 (patch) | |
| tree | e63c8f74a34c6250764136865c542af6ba78d989 /cloudinit/sources/DataSourceMAAS.py | |
| parent | 46a7a39775ed8f745ec8b63a9563f3ae6337d845 (diff) | |
| download | vyos-cloud-init-eacfc7ffbec3e6a0348ed484da895e2d2fc5ba10.tar.gz vyos-cloud-init-eacfc7ffbec3e6a0348ed484da895e2d2fc5ba10.zip | |
Get tests working and further adjustments.
Diffstat (limited to 'cloudinit/sources/DataSourceMAAS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceMAAS.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py index 6e1133b2..0c526305 100644 --- a/cloudinit/sources/DataSourceMAAS.py +++ b/cloudinit/sources/DataSourceMAAS.py @@ -223,9 +223,12 @@ def read_maas_seed_url(seed_url, header_cb=None, timeout=None, else: headers = {} try: - resp = util.read_file_or_url(url, headers=headers, timeout=timeout, - ssl_details=util.fetch_ssl_details(paths)) - if resp.ok: + ssl_details = util.fetch_ssl_details(paths) + resp = util.read_file_or_url(url, + headers=headers, + timeout=timeout, + ssl_details=ssl_details) + if resp.ok(): md[name] = str(resp) else: LOG.warn(("Fetching from %s resulted in" |