juju-deployer

Merge lp:~james-page/juju-deployer/bug-1625797 into lp:juju-deployer

  1. bug-1625797
  2. Merge into trunk
Proposed by James Page on 2016-09-23
Status: Merged
Merged at revision: 194
Proposed branch: lp:~james-page/juju-deployer/bug-1625797
Merge into: lp:juju-deployer
Diff against target: 13 lines (+2/-1)
1 file modified
deployer/service.py (+2/-1)
To merge this branch: bzr merge lp:~james-page/juju-deployer/bug-1625797
Reviewer Review Type Date Requested Status
Tim Van Steenburgh 2016-09-23 Approve on 2016-09-23
Review via email: mp+306595@code.launchpad.net
To post a comment you must log in.
lp:~james-page/juju-deployer/bug-1625797 updated on 2016-09-23
195. By James Page on 2016-09-23

Deal with either Machine or machine when determining placement - this ensures compatibility with juju 1 and 2

Marco Ceppi (marcoceppi) wrote :

+1 from me

Tim Van Steenburgh (tvansteenburgh) wrote :

+1, thanks James!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/service.py'
2--- deployer/service.py 2016-07-29 13:47:27 +0000
3+++ deployer/service.py 2016-09-23 09:33:57 +0000
4@@ -115,7 +115,8 @@
5 return None
6 unit_names = list(svc_units.keys())
7 unit_names.sort()
8- machine = svc_units[unit_names[int(u_idx)]].get('machine')
9+ machine = (svc_units[unit_names[int(u_idx)]].get('Machine') or
10+ svc_units[unit_names[int(u_idx)]].get('machine'))
11 if not machine:
12 self.deployment.log.warning(
13 "Application:%s deploy-with unit missing machine %s",

Subscribers

People subscribed via source and target branches