lp://qastaging/~tribaal/landscape-client/isolate-lxc-container-tests
- Get this branch:
- bzr branch lp://qastaging/~tribaal/landscape-client/isolate-lxc-container-tests
Branch merges
- Landscape: Pending requested
- Landscape: Pending requested
-
Diff: 129 lines (+52/-0)1 file modifiedlandscape/broker/tests/test_registration.py (+52/-0)
Branch information
Recent revisions
- 740. By Chris Glass
-
Added some mocking to the tests for container detection, since in case the test
suite is run inside a container the tests would fail. - 739. By Alberto Donato
-
Merged container-
info-from- run-container- type [r=tealeg, free.ekanayaka] [f=1239568]. This changes container detection to use /run/container_type (which is created by /etc/init/
container- detect. conf if running in a container). - 738. By Alberto Donato
-
Merged revert-
vm-info- schema [r=adam- collard, fcorrea] [f=1239733]. This reverts the vm-info schema to String, otherwise a new client woudn't be able to talk to an older server.
- 737. By Alberto Donato
-
Merge vm-and-
container- info-utf8- 2 [f=] [r=free. ekanayaka, adam-collard] [a=Alberto Donato]
Change 'vm-info' value type from string to uft8 for 'register-cloud-vm' message too. - 736. By Alberto Donato
-
Merge vm-and-
container- info-utf8 [f=] [r=free. ekanayaka, tealeg] [a=Alberto Donato]
Trivial change to make 'vm-info' and 'container-info' values utf8 in the message, instead of strings. - 735. By Alberto Donato
-
Merge detect-lxc [f=1236664] [r=chad.
smith,fcorrea] [a=Alberto Donato]
Detect if the client is running in a container (currently LXC), and report the information to the server at registration. - 734. By Jerry Seutter
-
Merge cloud-instance-
metadata- message [f=1226605] [r=ack,chad.smith] [a=Jerry Seutter]
Add a cloud-instance-metadata message type [f=1226605] [r=ack, chad.smith] This branch adds support for reporting cloud instance metadata using a
new cloud-instarce-metadata message. The metadata reported:
- ami-id
- instance-type
- instance-id - 733. By Adam Collard
-
Merge juju-info-
at-registration [f=1229630] [r=bjornt,ack] [a=Adam Collard]
Add Juju information at registration time.* Changed schema of JUJU_INFO message to be strict about the keys
* Re-used schema for REGISTER and REGISTER_CLOUD_VM messages
* Added l.lib.juju as resting ground for json parsing and error handling
* Moved juju_filename to main config object, not just specific to monitor - 732. By Björn Tillenius
-
Merge unmet-dependencies-bug-1203855 [f=1203855] [r=tribaal,ack] [a=Björn Tillenius]
Don't omit the package from the package changer result text if it's
broken but we don't know why.When a package is broken we check certain dependency to see whether they
are satisfied. If all the dependencies we check are satisified, the
package wasn't reported as being broken.Ideally we should write why the package is broken, but I have been
unable to reproduce the error in the bug report. - 731. By Geoff Teale
-
Merge allow-duplicate
-keys-in- config [f=1229200] [r=ack,tribaal] [a=Geoff Teale]
This branch catches ConfigObjError instances that are returned at the
end of parsing landscape-client. conf if there are issues in that file
(for example duplicate keys). Those errors are logged and the rest of
the configuration is recovered from the error and passed back. In
this way we emulate the tolerant behaviour we had prior to the switch
to ConfigObj.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/~landscape/landscape-client/trunk