lp://staging/~adam-collard/landscape-client/juju-info-at-registration

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~landscape/landscape-client/trunk at revision 733

Björn Tillenius (community): Approve on 2013-09-27

Alberto Donato: Approve on 2013-09-27

Diff: 614 lines (+240/-118)

13 files modified

landscape/broker/registration.py (+69/-51)
landscape/broker/tests/helpers.py (+3/-0)
landscape/broker/tests/test_registration.py (+38/-7)
landscape/deployment.py (+5/-0)
landscape/lib/juju.py (+26/-0)
landscape/lib/tests/test_encoding.py (+1/-1)
landscape/lib/tests/test_juju.py (+62/-0)
landscape/message_schemas.py (+10/-4)
landscape/monitor/config.py (+0/-7)
landscape/monitor/jujuinfo.py (+4/-22)
landscape/monitor/tests/test_config.py (+0/-11)
landscape/monitor/tests/test_jujuinfo.py (+9/-12)
landscape/tests/test_deployment.py (+13/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1229630: Send minimal Juju information on registration

High

Fix Released

Link a bug report

Related blueprints

733. By Adam Collard on 2013-09-27

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 on 2013-09-27

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 on 2013-09-26

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.

730. By David Britton on 2013-09-25

Merge unclean-warnings [f=] [r=ack,tribaal] [a=David Britton]
--unclean-warnings turn reactor uncleans into warnings instead of errors

729. By Alberto Donato on 2013-09-25

Merge touch-file-flaky-test-fix [f=1229245] [r=tribaal,adam-collard] [a=Alberto Donato]
Fix mocking for a flaky test.

728. By Adam Collard on 2013-09-25

Merge juju-message-type [f=1226863] [r=tribaal,free.ekanayaka] [a=Adam Collard]
Add JujuInfo plugin and associated juju-info message.

727. By Chris Glass on 2013-09-23

Merge fix-1228301-config-object-auto-list [f=1228301] [r=adam-collard,free.ekanayaka] [a=Chris Glass]
Prevent ConfigObj from being smart about list types

726. By David Britton on 2013-09-20

Merge client-tarmac-config [f=1228202] [r=fcorrea,tribaal] [a=David Britton]
Include tarmac auto-landing config in the client dev directory.

725. By Chris Glass on 2013-09-18

Merge rename-metadata-annotations [f=1226087] [r=free.ekanayaka,ack] [a=Chris Glass]
This branch renames the meta-data.d/ directory to annotations.d/

724. By Geoff Teale on 2013-09-18

Merge assertIsNone-in-deployment-tests [f=1226098] [r=chad.smith,davidpbritton] [a=Geoff Teale]
Lucid doesn't have assertIsNone. changed to assertEqual