Juju Charms Collection
bip package

Merge lp://staging/~josvaz/charms/trusty/bip/charmhelpers-cleanup into lp://staging/charms/trusty/bip

  1. Trusty Tahr (14.04)
  2. charmhelpers-cleanup
  3. Merge into trunk
Proposed by Jose L. VG
Status: Needs review
Proposed branch: lp://staging/~josvaz/charms/trusty/bip/charmhelpers-cleanup
Merge into: lp://staging/charms/trusty/bip
Diff against target: 16017 lines (+4357/-11008)
106 files modified
charm-helpers.yaml (+5/-0)
hooks/hooks.py (+8/-12)
lib/charm-helpers/LICENSE.txt (+0/-661)
lib/charm-helpers/MANIFEST.in (+0/-6)
lib/charm-helpers/Makefile (+0/-42)
lib/charm-helpers/README.test (+0/-7)
lib/charm-helpers/README.txt (+0/-8)
lib/charm-helpers/REVISION (+0/-1)
lib/charm-helpers/VERSION (+0/-1)
lib/charm-helpers/bin/README (+0/-1)
lib/charm-helpers/bin/contrib/charmsupport/charmsupport (+0/-31)
lib/charm-helpers/bin/contrib/saltstack/salt-call (+0/-11)
lib/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT (+0/-4)
lib/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py (+0/-183)
lib/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT (+0/-14)
lib/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py (+0/-217)
lib/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py (+0/-156)
lib/charm-helpers/charmhelpers/contrib/hahelpers/apache.py (+0/-58)
lib/charm-helpers/charmhelpers/contrib/hahelpers/ceph.py (+0/-278)
lib/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py (+0/-180)
lib/charm-helpers/charmhelpers/contrib/jujugui/IMPORT (+0/-4)
lib/charm-helpers/charmhelpers/contrib/jujugui/utils.py (+0/-602)
lib/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py (+0/-72)
lib/charm-helpers/charmhelpers/contrib/openstack/context.py (+0/-271)
lib/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py (+0/-2)
lib/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf (+0/-11)
lib/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg (+0/-37)
lib/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+0/-23)
lib/charm-helpers/charmhelpers/contrib/openstack/templating.py (+0/-261)
lib/charm-helpers/charmhelpers/contrib/openstack/utils.py (+0/-271)
lib/charm-helpers/charmhelpers/contrib/saltstack/__init__.py (+0/-126)
lib/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py (+0/-59)
lib/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py (+0/-88)
lib/charm-helpers/charmhelpers/contrib/storage/linux/utils.py (+0/-25)
lib/charm-helpers/charmhelpers/contrib/templating/pyformat.py (+0/-13)
lib/charm-helpers/charmhelpers/core/hookenv.py (+0/-340)
lib/charm-helpers/charmhelpers/core/host.py (+0/-272)
lib/charm-helpers/charmhelpers/fetch/__init__.py (+0/-152)
lib/charm-helpers/charmhelpers/fetch/archiveurl.py (+0/-48)
lib/charm-helpers/charmhelpers/payload/__init__.py (+0/-1)
lib/charm-helpers/charmhelpers/payload/archive.py (+0/-57)
lib/charm-helpers/charmhelpers/payload/execd.py (+0/-50)
lib/charm-helpers/debian/compat (+0/-1)
lib/charm-helpers/debian/control (+0/-20)
lib/charm-helpers/debian/rules (+0/-9)
lib/charm-helpers/debian/source/format (+0/-1)
lib/charm-helpers/scripts/README (+0/-1)
lib/charm-helpers/scripts/update-revno (+0/-11)
lib/charm-helpers/setup.cfg (+0/-4)
lib/charm-helpers/setup.py (+0/-39)
lib/charm-helpers/tarmac_tests.sh (+0/-6)
lib/charm-helpers/test_requirements.txt (+0/-18)
lib/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py (+0/-291)
lib/charm-helpers/tests/contrib/charmsupport/test_nrpe.py (+0/-222)
lib/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py (+0/-44)
lib/charm-helpers/tests/contrib/hahelpers/test_ceph_utils.py (+0/-59)
lib/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py (+0/-276)
lib/charm-helpers/tests/contrib/jujugui/config/apache-ports.template (+0/-2)
lib/charm-helpers/tests/contrib/jujugui/config/apache-site.template (+0/-30)
lib/charm-helpers/tests/contrib/jujugui/config/config.js.template (+0/-26)
lib/charm-helpers/tests/contrib/jujugui/config/haproxy.cfg.template (+0/-48)
lib/charm-helpers/tests/contrib/jujugui/config/haproxy.conf (+0/-22)
lib/charm-helpers/tests/contrib/jujugui/config/juju-api-agent.conf.template (+0/-14)
lib/charm-helpers/tests/contrib/jujugui/config/juju-api-improv.conf.template (+0/-12)
lib/charm-helpers/tests/contrib/jujugui/deploy.test (+0/-232)
lib/charm-helpers/tests/contrib/jujugui/test_utils.py (+0/-659)
lib/charm-helpers/tests/contrib/jujugui/unit.test (+0/-11)
lib/charm-helpers/tests/contrib/network/test_ovs.py (+0/-202)
lib/charm-helpers/tests/contrib/openstack/test_openstack_utils.py (+0/-417)
lib/charm-helpers/tests/contrib/openstack/test_os_contexts.py (+0/-454)
lib/charm-helpers/tests/contrib/openstack/test_os_templating.py (+0/-232)
lib/charm-helpers/tests/contrib/saltstack/test_saltstates.py (+0/-156)
lib/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py (+0/-73)
lib/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py (+0/-70)
lib/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py (+0/-23)
lib/charm-helpers/tests/contrib/templating/test_pyformat.py (+0/-36)
lib/charm-helpers/tests/core/test_hookenv.py (+0/-789)
lib/charm-helpers/tests/core/test_host.py (+0/-747)
lib/charm-helpers/tests/fetch/test_archiveurl.py (+0/-89)
lib/charm-helpers/tests/fetch/test_fetch.py (+0/-256)
lib/charm-helpers/tests/payload/test_archive.py (+0/-131)
lib/charm-helpers/tests/payload/test_execd.py (+0/-151)
lib/charm-helpers/tests/tools/test_charm_helper_sync.py (+0/-197)
lib/charm-helpers/tools/charm_helpers_sync/README (+0/-89)
lib/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py (+0/-168)
lib/charm-helpers/tools/charm_helpers_sync/example-config.yaml (+0/-14)
lib/charmhelpers/__init__.py (+36/-0)
lib/charmhelpers/core/__init__.py (+13/-0)
lib/charmhelpers/core/decorators.py (+55/-0)
lib/charmhelpers/core/files.py (+43/-0)
lib/charmhelpers/core/fstab.py (+132/-0)
lib/charmhelpers/core/hookenv.py (+1007/-0)
lib/charmhelpers/core/host.py (+765/-0)
lib/charmhelpers/core/hugepage.py (+69/-0)
lib/charmhelpers/core/kernel.py (+66/-0)
lib/charmhelpers/core/services/__init__.py (+16/-0)
lib/charmhelpers/core/services/base.py (+351/-0)
lib/charmhelpers/core/services/helpers.py (+290/-0)
lib/charmhelpers/core/strutils.py (+70/-0)
lib/charmhelpers/core/sysctl.py (+54/-0)
lib/charmhelpers/core/templating.py (+84/-0)
lib/charmhelpers/core/unitdata.py (+518/-0)
lib/charmhelpers/fetch/__init__.py (+467/-0)
lib/charmhelpers/fetch/archiveurl.py (+165/-0)
lib/charmhelpers/fetch/bzrurl.py (+75/-0)
lib/charmhelpers/fetch/giturl.py (+68/-0)
To merge this branch: bzr merge lp://staging/~josvaz/charms/trusty/bip/charmhelpers-cleanup
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Approve
Brad Marshall (community) Approve
charmers Pending
Review via email: mp+301499@code.staging.launchpad.net

Description of the change

Related to
https://code.launchpad.net/~josvaz/charms/trusty/bip/lp1604894/+merge/300643/+index?ss=1

X-CPC-Summary-Skip: 1

To post a comment you must log in.
Revision history for this message
Jose L. VG (josvaz) wrote :

This has been tested on a juju setup on GCE

Reply
Revision history for this message
Pen Gale (pengale) wrote :

Tests pass, and code looks good.

We are currently blocked from merging/promulgating by https://bugs.launchpad.net/charms/+source/bip/+bug/1612324 (charm needs to move out of the charmers namespace), however.

Reply
Revision history for this message
Jose L. VG (josvaz) wrote :

Anything I should be fixing here?

Reply
Revision history for this message
Pen Gale (pengale) wrote :

Dropping in an update here. The next steps for this change need to be:

@bradm needs to update his branch of this charm with the latest from ~charmers, then merge this PR into it. Then he needs to promulgate a charm from his namespace, and request that a charmer merge it.

That should update the charm store so that bip gets pointed at bradm's namespace (since he's the maintainer), and should allow bradm to more easily maintain the charm going forward.

@josvaz: you most likely don't need to do anything else with this PR; the maintainer (bradm) just needs to do some housekeeping to get things merged.

Reply
Revision history for this message
Brad Marshall (brad-marshall) wrote :

This looks good to me, I'm going to merge it into my branch and move over to the new namespace way of doing things. Apologies for the delay, I've been busy with other things, if someone wants to help out with this charm please let me know.

review: Approve
Reply
Revision history for this message
Jose L. VG (josvaz) wrote :

No worries, thanks Brad!

Please, let me know if/when this MP needs to/should be marked Merged.

Reply
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5551/

review: Approve (automated testing)
Reply
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5450/

review: Approve (automated testing)
Reply

Unmerged revisions

30. By Jose L. VG

Got charmhelpers for fetch as apt_install is now there

29. By Jose L. VG

Moved from charm-helpers/charmhelpers to just charmhelpers (plus clean-up)

28. By Jose L. VG

Result of removing charmhelpers and re-syncing it

27. By Jose L. VG

Added charm-helpers.yaml to manage helpers with charm_helpers_sync tool

26. By Jose L. VG

Flake8 suggested fixes, including unused imports

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

to all changes: