diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 14:21:02 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 14:21:02 -0700 |
| commit | 72fc1f762e5c5df563380e9ed90bfaba131e811b (patch) | |
| tree | 2420fd4938324bedc739ec4e1573a4211a12a02f /cloudinit/sources/DataSourceMAAS.py | |
| parent | 5233b6edb70702476463b47c06cb02b3c7f74c51 (diff) | |
| parent | d285a0463b6d16487eb5859373ccfd27eaec8b90 (diff) | |
| download | vyos-cloud-init-72fc1f762e5c5df563380e9ed90bfaba131e811b.tar.gz vyos-cloud-init-72fc1f762e5c5df563380e9ed90bfaba131e811b.zip | |
Sync with head and fix conflicts.
Diffstat (limited to 'cloudinit/sources/DataSourceMAAS.py')
| -rw-r--r-- | cloudinit/sources/DataSourceMAAS.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py index 581e9a4b..c172150b 100644 --- a/cloudinit/sources/DataSourceMAAS.py +++ b/cloudinit/sources/DataSourceMAAS.py @@ -338,7 +338,7 @@ if __name__ == "__main__": if args.config: import yaml with open(args.config) as fp: - cfg = yaml.safe_load(fp) + cfg = util.load_yaml(fp.read()) if 'datasource' in cfg: cfg = cfg['datasource']['MAAS'] for key in creds.keys(): |