Merge lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/fix-1493932 into lp://qastaging/charms/trusty/glance-simplestreams-sync
Proposed by
Mike McCracken
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/fix-1493932 |
| Merge into: | lp://qastaging/charms/trusty/glance-simplestreams-sync |
| Diff against target: |
4722 lines (+2571/-711) 40 files modified
.bzrignore (+1/-0) bin/charm_helpers_sync.py (+0/-253) charm-helpers-sync.yaml (+1/-1) config.yaml (+34/-1) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+3/-1) hooks/charmhelpers/contrib/network/ip.py (+5/-1) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+82/-10) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+361/-51) hooks/charmhelpers/contrib/openstack/context.py (+306/-40) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) hooks/charmhelpers/contrib/openstack/neutron.py (+120/-3) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6) hooks/charmhelpers/contrib/openstack/templates/git.upstart (+17/-0) hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0) hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0) hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0) hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14) hooks/charmhelpers/contrib/openstack/templating.py (+2/-2) hooks/charmhelpers/contrib/openstack/utils.py (+272/-97) hooks/charmhelpers/contrib/python/__init__.py (+15/-0) hooks/charmhelpers/contrib/python/packages.py (+54/-9) hooks/charmhelpers/core/files.py (+45/-0) hooks/charmhelpers/core/hookenv.py (+373/-43) hooks/charmhelpers/core/host.py (+164/-24) hooks/charmhelpers/core/hugepage.py (+62/-0) hooks/charmhelpers/core/kernel.py (+68/-0) hooks/charmhelpers/core/services/base.py (+43/-19) hooks/charmhelpers/core/services/helpers.py (+20/-4) hooks/charmhelpers/core/strutils.py (+2/-2) hooks/charmhelpers/core/unitdata.py (+62/-18) hooks/charmhelpers/fetch/__init__.py (+32/-15) hooks/charmhelpers/fetch/archiveurl.py (+7/-1) hooks/charmhelpers/fetch/giturl.py (+8/-6) hooks/hooks.py (+102/-26) metadata.yaml (+5/-0) scripts/glance-simplestreams-sync.py (+177/-19) scripts/glance-simplestreams-sync.sh (+3/-0) scripts/glance_simplestreams_sync_fastpoll (+1/-1) templates/identity.yaml (+21/-0) templates/mirrors.yaml (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/charms/trusty/glance-simplestreams-sync/fix-1493932 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-09-09.
Description of the change
Avoid cleaning up lock file when we didn't get the lock.
If more than one sync job runs while a first one is downloading the image, this would result in a second (or more) identical set of images being synced.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
