Merge lp:~tvansteenburgh/juju-deployer/1478256 into lp:juju-deployer

[Tim Van Steenburgh]

Support constraints defined as a list or dict, so any of these will work:

constraints: key=val

constraints:
  - key=val

constraints:
  key: val

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2015-06-18 08:34:12 +0000
+++ deployer/env/base.py	2015-07-28 16:16:39 +0000
@@ -86,6 +86,12 @@
                 fh.flush()
                 params.extend(["--config", fh.name])
             if constraints:
+                if isinstance(constraints, list):
+                    constraints = ' '.join(constraints)
+                if isinstance(constraints, dict):
+                    constraints = ' '.join([
+                        '{}={}'.format(k, v) for k, v in constraints.items()
+                    ])
                 params.extend(['--constraints', constraints])
             if num_units not in (1, None):
                 params.extend(["--num-units", str(num_units)])