Merge lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/trunk into lp://qastaging/charms/trusty/glance-simplestreams-sync
| Status: | Rejected |
|---|---|
| Rejected by: | James Page |
| Proposed branch: | lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/trunk |
| Merge into: | lp://qastaging/charms/trusty/glance-simplestreams-sync |
| Diff against target: |
570 lines (+321/-32) 6 files modified
config.yaml (+35/-2) hooks/hooks.py (+96/-23) metadata.yaml (+5/-0) scripts/glance-simplestreams-sync.py (+161/-7) templates/identity.yaml (+21/-0) templates/mirrors.yaml (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Update to latest version of charm from main repo on github.
Summary of changes:
- fix typo in image filter syntax in default charm config (rev 53)
- add interface for image-modifier subordinate script (rev 54)
- add exec.d customization support (rev 55)
- add config settings for object name prefix and content id template (rev 56)
- continue initial fast-polling if glance endpoint is not up yet (rev 57 and 62)
- if given a relation to rabbitmq-server, send image download status updates using kombu (rev 58 - 61)
| James Page (james-page) wrote | # |
Unmerged revisions
- 62. By Mike McCracken
-
Merge pull request #25 from mikemccracken/
retry-on- glance- exception retry polling on glance client exceptions
- 61. By Mike McCracken
-
Merge pull request #23 from mikemccracken/
rabbit- retry Retry connecting to rabbitmq at each message
- 60. By Mike McCracken
-
remove redundant import
- 59. By Mike McCracken
-
Merge pull request #21 from mikemccracken/
timestamp- sync-done Add timestamp to sync done message
- 58. By Mike McCracken
-
Merge pull request #16 from mikemccracken/
status- updates Support for image sync progress status updates via rabbitmq
- 57. By Mike McCracken
-
Merge pull request #20 from mikemccracken/
wait_for_ glance Wait for glance endpoint
- 56. By Mike McCracken
-
Merge pull request #18 from mikemccracken/
config- prefix- contentid Config prefix contentid
- 55. By Mike McCracken
-
Merge pull request #17 from mikemccracken/
add-execd Add exec.d support for private cloud pre-install customization
- 54. By Mike McCracken
-
Merge pull request #19 from mikemccracken/
add-image- modifier- hook add interface for subordinate charm to provide image modification scripts
- 53. By Mike McCracken
-
Fix filter syntax typo in default charm config
Already merged under a different MP