Merge lp://qastaging/~chad.smith/charms/trusty/glance-simplestreams-sync/sync-charmhelpers-for-add-apt-repo-retry into lp://qastaging/~openstack-charmers/charms/trusty/glance-simplestreams-sync/next
Proposed by
Chad Smith
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~chad.smith/charms/trusty/glance-simplestreams-sync/sync-charmhelpers-for-add-apt-repo-retry | ||||
| Merge into: | lp://qastaging/~openstack-charmers/charms/trusty/glance-simplestreams-sync/next | ||||
| Diff against target: |
10125 lines (+5920/-1725) 74 files modified
charm-helpers-sync.yaml (+1/-0) charmhelpers/__init__.py (+11/-13) charmhelpers/contrib/__init__.py (+11/-13) charmhelpers/contrib/charmsupport/__init__.py (+11/-13) charmhelpers/contrib/charmsupport/nrpe.py (+103/-34) charmhelpers/contrib/charmsupport/volumes.py (+11/-13) charmhelpers/contrib/hahelpers/__init__.py (+11/-13) charmhelpers/contrib/hahelpers/apache.py (+30/-17) charmhelpers/contrib/hahelpers/cluster.py (+70/-23) charmhelpers/contrib/network/__init__.py (+11/-13) charmhelpers/contrib/network/ip.py (+99/-42) charmhelpers/contrib/openstack/__init__.py (+11/-13) charmhelpers/contrib/openstack/alternatives.py (+11/-13) charmhelpers/contrib/openstack/amulet/__init__.py (+11/-13) charmhelpers/contrib/openstack/amulet/deployment.py (+200/-69) charmhelpers/contrib/openstack/amulet/utils.py (+354/-38) charmhelpers/contrib/openstack/context.py (+313/-127) charmhelpers/contrib/openstack/exceptions.py (+21/-0) charmhelpers/contrib/openstack/files/__init__.py (+11/-13) charmhelpers/contrib/openstack/files/check_haproxy.sh (+7/-5) charmhelpers/contrib/openstack/ha/__init__.py (+13/-0) charmhelpers/contrib/openstack/ha/utils.py (+139/-0) charmhelpers/contrib/openstack/ip.py (+60/-25) charmhelpers/contrib/openstack/keystone.py (+178/-0) charmhelpers/contrib/openstack/neutron.py (+57/-23) charmhelpers/contrib/openstack/templates/__init__.py (+11/-13) charmhelpers/contrib/openstack/templates/haproxy.cfg (+19/-11) charmhelpers/contrib/openstack/templates/memcached.conf (+53/-0) charmhelpers/contrib/openstack/templates/openstack_https_frontend (+5/-0) charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+5/-0) charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+8/-5) charmhelpers/contrib/openstack/templates/section-keystone-authtoken-legacy (+10/-0) charmhelpers/contrib/openstack/templates/section-keystone-authtoken-mitaka (+20/-0) charmhelpers/contrib/openstack/templates/wsgi-openstack-api.conf (+100/-0) charmhelpers/contrib/openstack/templating.py (+19/-15) charmhelpers/contrib/openstack/utils.py (+1163/-151) charmhelpers/contrib/python/__init__.py (+11/-13) charmhelpers/contrib/python/packages.py (+59/-26) charmhelpers/contrib/storage/__init__.py (+11/-13) charmhelpers/contrib/storage/linux/__init__.py (+11/-13) charmhelpers/contrib/storage/linux/ceph.py (+766/-72) charmhelpers/contrib/storage/linux/loopback.py (+21/-13) charmhelpers/contrib/storage/linux/lvm.py (+11/-13) charmhelpers/contrib/storage/linux/utils.py (+16/-18) charmhelpers/core/__init__.py (+11/-13) charmhelpers/core/decorators.py (+11/-13) charmhelpers/core/files.py (+11/-13) charmhelpers/core/fstab.py (+11/-13) charmhelpers/core/hookenv.py (+157/-19) charmhelpers/core/host.py (+482/-150) charmhelpers/core/host_factory/centos.py (+56/-0) charmhelpers/core/host_factory/ubuntu.py (+56/-0) charmhelpers/core/hugepage.py (+13/-13) charmhelpers/core/kernel.py (+34/-30) charmhelpers/core/kernel_factory/centos.py (+17/-0) charmhelpers/core/kernel_factory/ubuntu.py (+13/-0) charmhelpers/core/services/__init__.py (+11/-13) charmhelpers/core/services/base.py (+11/-13) charmhelpers/core/services/helpers.py (+25/-18) charmhelpers/core/strutils.py (+11/-13) charmhelpers/core/sysctl.py (+11/-13) charmhelpers/core/templating.py (+40/-24) charmhelpers/core/unitdata.py (+11/-14) charmhelpers/fetch/__init__.py (+43/-302) charmhelpers/fetch/archiveurl.py (+12/-14) charmhelpers/fetch/bzrurl.py (+48/-50) charmhelpers/fetch/centos.py (+171/-0) charmhelpers/fetch/giturl.py (+33/-37) charmhelpers/fetch/snap.py (+122/-0) charmhelpers/fetch/ubuntu.py (+364/-0) charmhelpers/osplatform.py (+25/-0) charmhelpers/payload/__init__.py (+11/-13) charmhelpers/payload/archive.py (+11/-13) charmhelpers/payload/execd.py (+14/-15) |
||||
| To merge this branch: | bzr merge lp://qastaging/~chad.smith/charms/trusty/glance-simplestreams-sync/sync-charmhelpers-for-add-apt-repo-retry | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Make sync of charmhelpers updates to get latest fetch.add_source retries logic.
The only official change to this branch is in charm-helpers-sync because host now depends on osplatform
--- charm-helpers-
+++ charm-helpers-
@@ -3,6 +3,7 @@
include:
- core
- fetch
+ - osplatform
- payload
- contrib.
- contrib.
To post a comment you must log in.
Unmerged revisions
- 60. By Chad Smith
-
make sync pulling in updated charmhelpers
- 59. By Chad Smith
-
Update charmhelpers dependencies prior to make sync since charmhelpers.host now imports get_platform from charmhelpers.
osplatform, we need to import osplatform too
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
