diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-11-07 10:23:32 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-11-07 10:23:32 -0500 |
| commit | 8ada8c1f625be5365a5116c458476c7deeae8818 (patch) | |
| tree | a2f3b4c968a3fd4cbc76ad59ce70563485ea8171 /cloudinit/sources/DataSourceMAAS.py | |
| parent | 0da58fe113726c7654bca54b365d95044b44ef87 (diff) | |
| parent | ce5a554672f4ffbc383af08a35d22a1dd89ce41f (diff) | |
| download | vyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.tar.gz vyos-cloud-init-8ada8c1f625be5365a5116c458476c7deeae8818.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceMAAS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceMAAS.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py index e187aec9..b55d8a21 100644 --- a/cloudinit/sources/DataSourceMAAS.py +++ b/cloudinit/sources/DataSourceMAAS.py @@ -336,8 +336,7 @@ if __name__ == "__main__": 'token_secret': args.tsec, 'consumer_secret': args.csec} if args.config: - with open(args.config) as fp: - cfg = util.load_yaml(fp.read()) + cfg = util.read_conf(args.config) if 'datasource' in cfg: cfg = cfg['datasource']['MAAS'] for key in creds.keys(): @@ -346,7 +345,7 @@ if __name__ == "__main__": def geturl(url, headers_cb): req = urllib2.Request(url, data=None, headers=headers_cb(url)) - return(urllib2.urlopen(req).read()) + return (urllib2.urlopen(req).read()) def printurl(url, headers_cb): print "== %s ==\n%s\n" % (url, geturl(url, headers_cb)) |