Merge lp://staging/~hopem/maas-deployer/lp1577275 into lp://staging/~maas-deployers/maas-deployer/next
Proposed by
Edward Hope-Morley
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~hopem/maas-deployer/lp1577275 |
| Merge into: | lp://staging/~maas-deployers/maas-deployer/next |
| Diff against target: |
253 lines (+107/-19) 7 files modified
examples/deployment.yaml (+11/-12) maas_deployer/vmaas/engine.py (+6/-2) maas_deployer/vmaas/templates/cloud-init.cfg (+11/-1) maas_deployer/vmaas/templates/config-maas.sh (+7/-0) maas_deployer/vmaas/templates/network-data (+21/-0) maas_deployer/vmaas/util.py (+0/-1) maas_deployer/vmaas/vm.py (+51/-3) |
| To merge this branch: | bzr merge lp://staging/~hopem/maas-deployer/lp1577275 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MAAS Deployers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 74. By Edward Hope-Morley
-
rebase with next
- 73. By Edward Hope-Morley
-
[hopem,r=] Add support for xenial cloud-init (and maas 2.0)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
