diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-20 17:56:22 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-20 17:56:22 -0700 |
| commit | e8a10a41d22876d555084def823817337d9c2a80 (patch) | |
| tree | 200f2f26a2bc362d0a55fdf7a743b26cf5d97ff0 /cloudinit/sources/DataSourceMAAS.py | |
| parent | 94b9647e4df742982cac8a2c2925fb4894281dbf (diff) | |
| download | vyos-cloud-init-e8a10a41d22876d555084def823817337d9c2a80.tar.gz vyos-cloud-init-e8a10a41d22876d555084def823817337d9c2a80.zip | |
Use only util methods for reading/loading/appending/peeking
at files since it is likely soon that we will add a new
way of adjusting the root of files read, also it is useful
for debugging to track what is being read/written in a central
fashion.
Diffstat (limited to 'cloudinit/sources/DataSourceMAAS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceMAAS.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py index c568d365..d166e9e3 100644 --- a/cloudinit/sources/DataSourceMAAS.py +++ b/cloudinit/sources/DataSourceMAAS.py @@ -301,9 +301,7 @@ if __name__ == "__main__": 'token_secret': args.tsec, 'consumer_secret': args.csec} if args.config: - import yaml - with open(args.config) as fp: - cfg = yaml.safe_load(fp) + cfg = util.read_conf(args.config) if 'datasource' in cfg: cfg = cfg['datasource']['MAAS'] for key in creds.keys(): @@ -312,7 +310,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)) |