Merge lp://qastaging/~adam-stokes/landscape-charm/add-conjure-up into lp://qastaging/~landscape/landscape-charm/trunk
Proposed by
Adam Stokes
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~adam-stokes/landscape-charm/add-conjure-up |
| Merge into: | lp://qastaging/~landscape/landscape-charm/trunk |
| Diff against target: |
786 lines (+723/-0) (has conflicts) 12 files modified
Makefile (+18/-0) README.md (+28/-0) charm-store (+23/-0) conjure/metadata.json (+5/-0) conjure/steps/01_register-autopilot.sh (+13/-0) conjure/steps/configure-landscape (+210/-0) landscape-dense-maas.yaml (+63/-0) landscape-dense.yaml (+59/-0) landscape-scalable.yaml (+49/-0) landscape-template.jinja2 (+99/-0) render-bundles (+58/-0) update-charm-revisions (+98/-0) Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.md. Moved existing file to README.md.moved. |
| To merge this branch: | bzr merge lp://qastaging/~adam-stokes/landscape-charm/add-conjure-up |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Landscape | Pending | ||
| Landscape | Pending | ||
|
Review via email:
|
|||
Description of the change
This adds the proper metadata to make this bundle conjure-up enabled. Additionally, I've added tags to the bundle to add more context to what this bundle provides.
To post a comment you must log in.
Unmerged revisions
- 28. By Adam Stokes
-
Update processing script
Die properly if the services are in error state.
- 27. By Adam Stokes
-
Add description to bundle metadata
- 26. By Adam Stokes
-
merge r24
- 25. By Adam Stokes
-
add make render output
- 24. By Adam Stokes
-
Add conjure-up enablement
- 23. By Andreas Hasenack
-
Updated charm revisions
- 22. By Adam Collard
-
Bump us (again) to 16.03 from 15.11 in the bundle [trivial] [r=ack]
- 21. By David Britton
-
don't use machines in 'scalable' case.
- 20. By David Britton
-
check in rendered changes to bundles.
- 19. By David Britton
-
to: needs to be an array in v4 bundles.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
