lp:~niedbalski/juju-deployer/fix-lp1454720

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:juju-deployer at revision 145

Tim Van Steenburgh (community): Approve on 2015-05-13

Diff: 187 lines (+110/-12)

4 files modified

deployer/action/importer.py (+40/-11)
deployer/deployment.py (+7/-1)
deployer/tests/test_data/v4/container-existing-machine.yaml (+42/-0)
deployer/tests/test_importer.py (+21/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1454720: Machine placement doesn't support existing machines

Undecided

Fix Released

Link a bug report

Related blueprints

148. By Jorge Niedbalski on 2015-05-13

Addressed @tvan review

147. By Jorge Niedbalski on 2015-05-13

Added docstrings

146. By Jorge Niedbalski on 2015-05-13

Added unit tests

145. By Jorge Niedbalski on 2015-05-12

Added support for existing machines

144. By David Britton on 2015-03-25

Add v4 support for machine spec per bundles spec. [a=Makyo] [r=davidpbritton]

143. By David Britton on 2015-03-17

Clarify comment why 'DEB_BUILD_ARCH' is used for skipping tests.

142. By David Britton on 2015-03-17

Explicitly skip class setup/teardown if testing offline.

141. By David Britton on 2015-03-17

- isolate JUJU_HOME from user setting
- use the _and_fetch method for tests that needed network access but were not explicit
- decorate said tests with offline_skip

140. By David Britton on 2015-03-17

Merge missing-units [r=davidpbritton,bac,makyo] [a=frankban]
Disallow deploying a bundle when a service unit placement points to a subordinate service.

139. By David Britton on 2015-03-12

merge lp:1431570 log spelling fix [r=davidpbritton] [a=cjohnston]