Landscape Charm

Merge lp://qastaging/~ericsnowcurrently/landscape-charm/juju2-collect-inner-model into lp://qastaging/~landscape/landscape-charm/tools

Proposed by Eric Snow on 2016-08-17

Status:	Superseded
Proposed branch:	lp://qastaging/~ericsnowcurrently/landscape-charm/juju2-collect-inner-model
Merge into:	lp://qastaging/~landscape/landscape-charm/tools
Diff against target:	1230 lines (+1004/-79) 2 files modified collect-logs (+187/-79) test_collect-logs.py (+817/-0)
To merge this branch:	bzr merge lp://qastaging/~ericsnowcurrently/landscape-charm/juju2-collect-inner-model
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Landscape	2016-08-17	Pending
Landscape	2016-08-17	Pending
Review via email: mp+303197@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-08-17.

Make collect-logs work with Juju 2.

Testing instructions:

1. Deploy landscape
2. install juju-2.0 on the landscape-server/0 unit
3. enable the "juju-2.0" feature flag
4. autopilot
5. run collect-logs

32. By Eric Snow on 2016-08-17: Fix the retry message.
33. By Eric Snow on 2016-08-17: More clearly identify "inner" log collection.
34. By Eric Snow on 2016-08-22: Merge from parent branch.
35. By Eric Snow on 2016-08-23: Merge from parent branch.
36. By Eric Snow on 2016-08-23: Use correct types.
37. By Eric Snow on 2016-08-23: Correctly build commands for the inner model.
38. By Eric Snow on 2016-08-23: Improve logging.
39. By Eric Snow on 2016-08-23: Drop special treatment for sudo.
40. By Eric Snow on 2016-08-23: Work around a permissions issue with the cookie file.
41. By Eric Snow on 2016-08-26: Clean up log messages.
42. By Eric Snow on 2016-08-26: Distinguish between Juju 1 and 2 better.
43. By Eric Snow on 2016-08-26: Add missing docstrings.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

People subscribed via source and target branches

to all changes: