Merge lp:~mthaddon/juju-deployer/pre-release-force into lp:juju-deployer

[Tom Haddon]

Include --force if we're on juju 2 in deploy command to ensure we can deploy pre-release series

Include --force if we're on juju 2 in deploy command to ensure we can deploy pre-release series

[Tim Van Steenburgh (tvansteenburgh)]

LGTM.

review: Approve

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2017-08-30 09:47:55 +0000
+++ deployer/env/base.py	2020-02-26 12:29:37 +0000
@@ -75,6 +75,9 @@
                resources=None, storage=None, num_units=1, force_machine=None,
                series=None, bindings=None):
         params = self._named_env(["juju", "deploy"])
+        if self.juju_version == 2:
+            # Needed for pre-release series on Juju 2, but safe for all series.
+            params.append("--force")
         with temp_file() as fh:
             if config:
                 fh.write(yaml_dump({name: config}).encode())