Merge lp://qastaging/~openstack-charmers/charms/trusty/glance-simplestreams-sync/next into lp://qastaging/charms/trusty/glance-simplestreams-sync

Proposed by James Page
Status: Merged
Merged at revision: 53
Proposed branch: lp://qastaging/~openstack-charmers/charms/trusty/glance-simplestreams-sync/next
Merge into: lp://qastaging/charms/trusty/glance-simplestreams-sync
Diff against target: 24155 lines (+12222/-10865)
152 files modified
.bzrignore (+5/-0)
.testr.conf (+8/-0)
Makefile (+21/-5)
bin/charm_helpers_sync.py (+0/-253)
charm-helpers-sync.yaml (+5/-2)
charmhelpers/__init__.py (+38/-0)
charmhelpers/contrib/__init__.py (+15/-0)
charmhelpers/contrib/charmsupport/__init__.py (+15/-0)
charmhelpers/contrib/charmsupport/nrpe.py (+360/-0)
charmhelpers/contrib/charmsupport/volumes.py (+175/-0)
charmhelpers/contrib/hahelpers/__init__.py (+15/-0)
charmhelpers/contrib/hahelpers/apache.py (+82/-0)
charmhelpers/contrib/hahelpers/cluster.py (+316/-0)
charmhelpers/contrib/network/__init__.py (+15/-0)
charmhelpers/contrib/network/ip.py (+456/-0)
charmhelpers/contrib/openstack/__init__.py (+15/-0)
charmhelpers/contrib/openstack/alternatives.py (+33/-0)
charmhelpers/contrib/openstack/amulet/__init__.py (+15/-0)
charmhelpers/contrib/openstack/amulet/deployment.py (+197/-0)
charmhelpers/contrib/openstack/amulet/utils.py (+963/-0)
charmhelpers/contrib/openstack/context.py (+1427/-0)
charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0)
charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
charmhelpers/contrib/openstack/ip.py (+151/-0)
charmhelpers/contrib/openstack/neutron.py (+356/-0)
charmhelpers/contrib/openstack/templates/__init__.py (+18/-0)
charmhelpers/contrib/openstack/templates/ceph.conf (+21/-0)
charmhelpers/contrib/openstack/templates/git.upstart (+17/-0)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+58/-0)
charmhelpers/contrib/openstack/templates/openstack_https_frontend (+24/-0)
charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+24/-0)
charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+9/-0)
charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo (+22/-0)
charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0)
charmhelpers/contrib/openstack/templating.py (+323/-0)
charmhelpers/contrib/openstack/utils.py (+977/-0)
charmhelpers/contrib/python/__init__.py (+15/-0)
charmhelpers/contrib/python/packages.py (+121/-0)
charmhelpers/contrib/storage/__init__.py (+15/-0)
charmhelpers/contrib/storage/linux/__init__.py (+15/-0)
charmhelpers/contrib/storage/linux/ceph.py (+657/-0)
charmhelpers/contrib/storage/linux/loopback.py (+78/-0)
charmhelpers/contrib/storage/linux/lvm.py (+105/-0)
charmhelpers/contrib/storage/linux/utils.py (+71/-0)
charmhelpers/core/__init__.py (+15/-0)
charmhelpers/core/decorators.py (+57/-0)
charmhelpers/core/files.py (+45/-0)
charmhelpers/core/fstab.py (+134/-0)
charmhelpers/core/hookenv.py (+930/-0)
charmhelpers/core/host.py (+586/-0)
charmhelpers/core/hugepage.py (+69/-0)
charmhelpers/core/kernel.py (+68/-0)
charmhelpers/core/services/__init__.py (+18/-0)
charmhelpers/core/services/base.py (+353/-0)
charmhelpers/core/services/helpers.py (+283/-0)
charmhelpers/core/strutils.py (+72/-0)
charmhelpers/core/sysctl.py (+56/-0)
charmhelpers/core/templating.py (+68/-0)
charmhelpers/core/unitdata.py (+521/-0)
charmhelpers/fetch/__init__.py (+456/-0)
charmhelpers/fetch/archiveurl.py (+167/-0)
charmhelpers/fetch/bzrurl.py (+78/-0)
charmhelpers/fetch/giturl.py (+73/-0)
charmhelpers/payload/__init__.py (+17/-0)
charmhelpers/payload/archive.py (+73/-0)
charmhelpers/payload/execd.py (+66/-0)
config.yaml (+34/-1)
hooks/charmhelpers/__init__.py (+0/-38)
hooks/charmhelpers/cli/README.rst (+0/-57)
hooks/charmhelpers/cli/__init__.py (+0/-147)
hooks/charmhelpers/cli/commands.py (+0/-2)
hooks/charmhelpers/cli/host.py (+0/-15)
hooks/charmhelpers/contrib/__init__.py (+0/-15)
hooks/charmhelpers/contrib/ansible/__init__.py (+0/-165)
hooks/charmhelpers/contrib/charmhelpers/IMPORT (+0/-4)
hooks/charmhelpers/contrib/charmhelpers/__init__.py (+0/-184)
hooks/charmhelpers/contrib/charmsupport/__init__.py (+0/-15)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+0/-358)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+0/-175)
hooks/charmhelpers/contrib/hahelpers/apache.py (+0/-59)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+0/-183)
hooks/charmhelpers/contrib/jujugui/IMPORT (+0/-4)
hooks/charmhelpers/contrib/jujugui/utils.py (+0/-602)
hooks/charmhelpers/contrib/network/__init__.py (+0/-15)
hooks/charmhelpers/contrib/network/ip.py (+0/-450)
hooks/charmhelpers/contrib/network/ovs/__init__.py (+0/-75)
hooks/charmhelpers/contrib/openstack/__init__.py (+0/-15)
hooks/charmhelpers/contrib/openstack/alternatives.py (+0/-33)
hooks/charmhelpers/contrib/openstack/amulet/__init__.py (+0/-15)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+0/-111)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+0/-294)
hooks/charmhelpers/contrib/openstack/context.py (+0/-1106)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+0/-18)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+0/-32)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+0/-30)
hooks/charmhelpers/contrib/openstack/ip.py (+0/-146)
hooks/charmhelpers/contrib/openstack/neutron.py (+0/-239)
hooks/charmhelpers/contrib/openstack/templates/__init__.py (+0/-18)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+0/-15)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+0/-58)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+0/-24)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+0/-24)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14)
hooks/charmhelpers/contrib/openstack/templating.py (+0/-295)
hooks/charmhelpers/contrib/openstack/utils.py (+0/-576)
hooks/charmhelpers/contrib/peerstorage/__init__.py (+0/-83)
hooks/charmhelpers/contrib/python/packages.py (+0/-76)
hooks/charmhelpers/contrib/python/version.py (+0/-18)
hooks/charmhelpers/contrib/saltstack/__init__.py (+0/-102)
hooks/charmhelpers/contrib/ssl/__init__.py (+0/-78)
hooks/charmhelpers/contrib/ssl/service.py (+0/-267)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+0/-387)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+0/-62)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+0/-88)
hooks/charmhelpers/contrib/storage/linux/utils.py (+0/-49)
hooks/charmhelpers/contrib/templating/contexts.py (+0/-104)
hooks/charmhelpers/contrib/templating/pyformat.py (+0/-13)
hooks/charmhelpers/contrib/unison/__init__.py (+0/-257)
hooks/charmhelpers/core/__init__.py (+0/-15)
hooks/charmhelpers/core/decorators.py (+0/-57)
hooks/charmhelpers/core/fstab.py (+0/-134)
hooks/charmhelpers/core/hookenv.py (+0/-568)
hooks/charmhelpers/core/host.py (+0/-446)
hooks/charmhelpers/core/services/__init__.py (+0/-18)
hooks/charmhelpers/core/services/base.py (+0/-329)
hooks/charmhelpers/core/services/helpers.py (+0/-267)
hooks/charmhelpers/core/strutils.py (+0/-42)
hooks/charmhelpers/core/sysctl.py (+0/-56)
hooks/charmhelpers/core/templating.py (+0/-68)
hooks/charmhelpers/core/unitdata.py (+0/-477)
hooks/charmhelpers/fetch/__init__.py (+0/-439)
hooks/charmhelpers/fetch/archiveurl.py (+0/-161)
hooks/charmhelpers/fetch/bzrurl.py (+0/-78)
hooks/charmhelpers/fetch/giturl.py (+0/-71)
hooks/charmhelpers/payload/__init__.py (+0/-1)
hooks/charmhelpers/payload/archive.py (+0/-57)
hooks/charmhelpers/payload/execd.py (+0/-50)
hooks/hooks.py (+120/-38)
metadata.yaml (+7/-1)
requirements/requirements-precise.txt (+8/-0)
requirements/requirements-trusty.txt (+8/-0)
requirements/test-requirements.txt (+6/-0)
scripts/glance-simplestreams-sync.py (+179/-20)
scripts/glance-simplestreams-sync.sh (+3/-0)
scripts/glance_simplestreams_sync_fastpoll (+1/-1)
setup.cfg (+6/-0)
templates/identity.yaml (+21/-0)
templates/mirrors.yaml (+3/-0)
tox.ini (+36/-0)
unit_tests/test_hooks.py (+105/-0)
unit_tests/test_utils.py (+133/-0)
To merge this branch: bzr merge lp://qastaging/~openstack-charmers/charms/trusty/glance-simplestreams-sync/next
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+270494@code.qastaging.launchpad.net

Description of the change

Re-sync charm with the working repository on github.com

This repository is now obsolete but does contain a number of pertinent fixes.

To post a comment you must log in.
56. By Billy Olsen

[freyes,r=billy-olsen]

Refactor config-changed hook to ensure that cron jobs are installed
properly.

Closes-Bug: #1434356

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches