juju-deployer

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

  1. pre-release-force
  2. Merge into trunk
Proposed by Tom Haddon
Status: Merged
Merged at revision: 216
Proposed branch: lp:~mthaddon/juju-deployer/pre-release-force
Merge into: lp:juju-deployer
Diff against target: 13 lines (+3/-0)
1 file modified
deployer/env/base.py (+3/-0)
To merge this branch: bzr merge lp:~mthaddon/juju-deployer/pre-release-force
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+379883@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/env/base.py'
2--- deployer/env/base.py 2017-08-30 09:47:55 +0000
3+++ deployer/env/base.py 2020-02-26 12:29:37 +0000
4@@ -75,6 +75,9 @@
5 resources=None, storage=None, num_units=1, force_machine=None,
6 series=None, bindings=None):
7 params = self._named_env(["juju", "deploy"])
8+ if self.juju_version == 2:
9+ # Needed for pre-release series on Juju 2, but safe for all series.
10+ params.append("--force")
11 with temp_file() as fh:
12 if config:
13 fh.write(yaml_dump({name: config}).encode())

Subscribers

People subscribed via source and target branches