Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes into lp:adt-cloud-worker
Status: | Superseded |
---|---|
Proposed branch: | lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes |
Merge into: | lp:adt-cloud-worker |
Diff against target: |
433 lines (+423/-0) (has conflicts) 2 files modified
README.rst (+30/-0) uci-nova (+393/-0) Conflict adding file README.rst. Moved existing file to README.rst.moved. |
To merge this branch: | bzr merge lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical CI Engineering | Pending | ||
Review via email: mp+256357@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-04-15.
Commit message
cloud-data improvements.
Description of the change
Include fixes from pitti's vm-setup script. Should improve pass rate.
Unmerged revisions
- 9. By Thomi Richards
-
Always reboot.
- 8. By Thomi Richards
-
Fix typo.
- 7. By Thomi Richards
-
Integrate fixes for cloud-init userdata from pitti's autopkgtest vm-setup script.
- 6. By Celso Providelo
-
Return console-logging cmd-line option back to adt on open(), so it can be properly used when calling cleanup() later on. [r=Francis Ginther]
- 5. By Francis Ginther
-
Add missing ':' for console in long opts list. [r=Thomi Richards]
- 4. By Francis Ginther
-
Add support for saving the nova console-log to the specified location. Also increase the number of ipaddr retries as spawning can be a bit slow. [r=Thomi Richards, Paul Larson]
- 3. By Paul Larson
-
Support snappy images by enabling ssh in the cloud-init data for snappy
- 2. By Celso Providelo
-
Coping with missing neutron security-groups capabilities (cannonistack and stackystack) and falling back to nova security-groups without egress traffic control.
- 1. By Celso Providelo
-
Initial import of the neutron-
security- group-based setup.