Merge lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/conditional-endpoint-update into lp://qastaging/~landscape/charms/trusty/glance-simplestreams-sync/landscape
| Status: | Merged |
|---|---|
| Merged at revision: | 68 |
| Proposed branch: | lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/conditional-endpoint-update |
| Merge into: | lp://qastaging/~landscape/charms/trusty/glance-simplestreams-sync/landscape |
| Diff against target: |
82 lines (+20/-15) 1 file modified
scripts/glance-simplestreams-sync.py (+20/-15) |
| To merge this branch: | bzr merge lp://qastaging/~danilo/charms/trusty/glance-simplestreams-sync/conditional-endpoint-update |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Bogdana Vereha (community) | Approve | ||
| Geoff Teale (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Only update (delete/create) "image-stream" endpoint if different from values we want to set it to
This will reduce the changes of hitting a race on keystone units during Autopilot installation: instead of doing delete/create dance every time, we only do it when really needed.
Testing instructions:
1. Deploy OPL
2. Modify canonical/
cs:
3. Deploy Autopilot (swift and ceph for object store will use different endpoints, so might be worth re-testing both, even though we do not change that part of the logic)
4. Watch for logging messages about not updating the endpoint ("Endpoint already set to desired values, moving on.") in /var/log/
5. Check that things like juju bootstrap still work, that images are correctly synced, etc.
| Данило Шеган (danilo) wrote | # |
+1 This looks great. Especially like the use of all(), because I'm a sucker for that stuff ;-)