Merge lp:~sidnei/juju-deployer/config-yaml-loader into lp:~gandelman-a/juju-deployer/trunk

[Sidnei da Silva]

Switch to using yaml to load the config, so it works with either json or yaml.

Switch to using yaml to load the config, so it works with either json or yaml.

=== modified file 'deployer.py'
--- deployer.py	2013-03-04 18:05:48 +0000
+++ deployer.py	2013-04-23 19:54:26 +0000
@@ -5,7 +5,6 @@
 import time
 import os
 import yaml
-import json
 import optparse
 import pprint
 import signal
@@ -24,7 +23,7 @@
 
 parser = optparse.OptionParser()
 parser.add_option('-c', '--config',
-                  help=('File containing deployment(s) json config. This '
+                  help=('File containing deployment(s) config. This '
                         'option can be repeated, with later files overriding '
                         'values in earlier ones.'),
                   dest='configs', action='append')
@@ -104,7 +103,7 @@
     rc = find_service(juju_status(opts.juju_env), opts.find_service)
     exit(rc)
 
-# load the json configuration for possible deployments.
+# load the configuration for possible deployments.
 missing_configs = [c for c in opts.configs if not os.path.exists(c)]
 if missing_configs:
     log.error("Configuration not found: {}".format(", ".join(missing_configs)))
@@ -117,7 +116,7 @@
     include_dirs.append(dirname(abspath(config)))
     with open(config, 'r') as f:
         try:
-            cfg = dict_merge(cfg, json.load(f))
+            cfg = dict_merge(cfg, yaml.safe_load(f))
         except ValueError as exc:
             log.error("Error parsing config: {}".format(config))
             log.error(exc)
@@ -205,7 +204,7 @@
     if os.path.exists("%s/config.yaml" % charm_path):
         debug_msg("Loading config.yaml from %s/config.yaml" % charm_path)
         conf = open("%s/config.yaml" % charm_path)
-        CHARMS[k]["config"] = yaml.load(conf)["options"]
+        CHARMS[k]["config"] = yaml.safe_load(conf)["options"]
         conf.close()
     if "units" not in CHARMS[k].keys():
         CHARMS[k]["units"] = 1