Merge lib-in-python-package

2015-07-17 11:44:07 +01:00 · 2015-07-17 11:44:07 +01:00 · 25547804bf
commit 25547804bf
parent 211de2f3d0 fa4608ef3e
67 changed files with 7 additions and 4 deletions
--- a/5
+++ b/5
@ -2,8 +2,9 @@
 PYTHON := /usr/bin/env python

 lint:
-	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers unit_tests tests
+	@flake8 lib
+	@flake8 --exclude charmhelpers hooks
+	@flake8 --exclude charmhelpers unit_tests tests
 	@charm proof

 unit_test:
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@ -1,5 +1,5 @@
 branch: lp:charm-helpers
-destination: hooks/charmhelpers
+destination: charmhelpers
 include:
    - core
    - contrib.openstack|inc=*
--- a/hooks/charmhelpers/init.py
+++ b/hooks/charmhelpers/init.py
--- a/hooks/charmhelpers/contrib/init.py
+++ b/hooks/charmhelpers/contrib/init.py
--- a/hooks/charmhelpers/contrib/charmsupport/init.py
+++ b/hooks/charmhelpers/contrib/charmsupport/init.py
--- a/hooks/charmhelpers/contrib/charmsupport/nrpe.py
+++ b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
--- a/hooks/charmhelpers/contrib/charmsupport/volumes.py
+++ b/hooks/charmhelpers/contrib/charmsupport/volumes.py
--- a/hooks/charmhelpers/contrib/hahelpers/init.py
+++ b/hooks/charmhelpers/contrib/hahelpers/init.py
--- a/hooks/charmhelpers/contrib/hahelpers/apache.py
+++ b/hooks/charmhelpers/contrib/hahelpers/apache.py
--- a/hooks/charmhelpers/contrib/hahelpers/ceph.py
+++ b/hooks/charmhelpers/contrib/hahelpers/ceph.py
--- a/hooks/charmhelpers/contrib/hahelpers/cluster.py
+++ b/hooks/charmhelpers/contrib/hahelpers/cluster.py
--- a/hooks/charmhelpers/contrib/network/init.py
+++ b/hooks/charmhelpers/contrib/network/init.py
--- a/hooks/charmhelpers/contrib/network/ip.py
+++ b/hooks/charmhelpers/contrib/network/ip.py
--- a/hooks/charmhelpers/contrib/openstack/init.py
+++ b/hooks/charmhelpers/contrib/openstack/init.py
--- a/hooks/charmhelpers/contrib/openstack/alternatives.py
+++ b/hooks/charmhelpers/contrib/openstack/alternatives.py
--- a/hooks/charmhelpers/contrib/openstack/amulet/init.py
+++ b/hooks/charmhelpers/contrib/openstack/amulet/init.py
--- a/hooks/charmhelpers/contrib/openstack/amulet/deployment.py
+++ b/hooks/charmhelpers/contrib/openstack/amulet/deployment.py
--- a/hooks/charmhelpers/contrib/openstack/amulet/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/amulet/utils.py
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
--- a/hooks/charmhelpers/contrib/openstack/files/init.py
+++ b/hooks/charmhelpers/contrib/openstack/files/init.py
--- a/hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh
+++ b/hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh
--- a/hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh
+++ b/hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh
--- a/hooks/charmhelpers/contrib/openstack/ip.py
+++ b/hooks/charmhelpers/contrib/openstack/ip.py
--- a/hooks/charmhelpers/contrib/openstack/neutron.py
+++ b/hooks/charmhelpers/contrib/openstack/neutron.py
--- a/hooks/charmhelpers/contrib/openstack/templates/init.py
+++ b/hooks/charmhelpers/contrib/openstack/templates/init.py
--- a/hooks/charmhelpers/contrib/openstack/templates/ceph.conf
+++ b/hooks/charmhelpers/contrib/openstack/templates/ceph.conf
--- a/hooks/charmhelpers/contrib/openstack/templates/git.upstart
+++ b/hooks/charmhelpers/contrib/openstack/templates/git.upstart
--- a/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
+++ b/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
--- a/hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend
+++ b/hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend
--- a/hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf
+++ b/hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf
--- a/hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken
+++ b/hooks/charmhelpers/contrib/openstack/templates/section-keystone-authtoken
--- a/hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo
+++ b/hooks/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo
--- a/hooks/charmhelpers/contrib/openstack/templates/section-zeromq
+++ b/hooks/charmhelpers/contrib/openstack/templates/section-zeromq
--- a/hooks/charmhelpers/contrib/openstack/templating.py
+++ b/hooks/charmhelpers/contrib/openstack/templating.py
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
--- a/hooks/charmhelpers/contrib/python/init.py
+++ b/hooks/charmhelpers/contrib/python/init.py
--- a/hooks/charmhelpers/contrib/python/packages.py
+++ b/hooks/charmhelpers/contrib/python/packages.py
--- a/hooks/charmhelpers/contrib/storage/init.py
+++ b/hooks/charmhelpers/contrib/storage/init.py
--- a/hooks/charmhelpers/contrib/storage/linux/init.py
+++ b/hooks/charmhelpers/contrib/storage/linux/init.py
--- a/hooks/charmhelpers/contrib/storage/linux/ceph.py
+++ b/hooks/charmhelpers/contrib/storage/linux/ceph.py
--- a/hooks/charmhelpers/contrib/storage/linux/loopback.py
+++ b/hooks/charmhelpers/contrib/storage/linux/loopback.py
--- a/hooks/charmhelpers/contrib/storage/linux/lvm.py
+++ b/hooks/charmhelpers/contrib/storage/linux/lvm.py
--- a/hooks/charmhelpers/contrib/storage/linux/utils.py
+++ b/hooks/charmhelpers/contrib/storage/linux/utils.py
--- a/hooks/charmhelpers/core/init.py
+++ b/hooks/charmhelpers/core/init.py
--- a/hooks/charmhelpers/core/decorators.py
+++ b/hooks/charmhelpers/core/decorators.py
--- a/hooks/charmhelpers/core/fstab.py
+++ b/hooks/charmhelpers/core/fstab.py
--- a/hooks/charmhelpers/core/hookenv.py
+++ b/hooks/charmhelpers/core/hookenv.py
--- a/hooks/charmhelpers/core/host.py
+++ b/hooks/charmhelpers/core/host.py
--- a/hooks/charmhelpers/core/services/init.py
+++ b/hooks/charmhelpers/core/services/init.py
--- a/hooks/charmhelpers/core/services/base.py
+++ b/hooks/charmhelpers/core/services/base.py
--- a/hooks/charmhelpers/core/services/helpers.py
+++ b/hooks/charmhelpers/core/services/helpers.py
--- a/hooks/charmhelpers/core/strutils.py
+++ b/hooks/charmhelpers/core/strutils.py
--- a/hooks/charmhelpers/core/sysctl.py
+++ b/hooks/charmhelpers/core/sysctl.py
--- a/hooks/charmhelpers/core/templating.py
+++ b/hooks/charmhelpers/core/templating.py
--- a/hooks/charmhelpers/core/unitdata.py
+++ b/hooks/charmhelpers/core/unitdata.py
--- a/hooks/charmhelpers/fetch/init.py
+++ b/hooks/charmhelpers/fetch/init.py
--- a/hooks/charmhelpers/fetch/archiveurl.py
+++ b/hooks/charmhelpers/fetch/archiveurl.py
--- a/hooks/charmhelpers/fetch/bzrurl.py
+++ b/hooks/charmhelpers/fetch/bzrurl.py
--- a/hooks/charmhelpers/fetch/giturl.py
+++ b/hooks/charmhelpers/fetch/giturl.py
--- a/hooks/charmhelpers/payload/init.py
+++ b/hooks/charmhelpers/payload/init.py
--- a/hooks/charmhelpers/payload/execd.py
+++ b/hooks/charmhelpers/payload/execd.py
--- a/hooks/charmhelpers
+++ b/hooks/charmhelpers
@ -0,0 +1 @@
+../charmhelpers/
--- a/hooks/lib
+++ b/hooks/lib
@ -0,0 +1 @@
+../lib
--- a/hooks/swift_storage_hooks.py
+++ b/hooks/swift_storage_hooks.py
@ -3,7 +3,7 @@
 import os
 import sys

-from swift_storage_utils import (
+from lib.swift_storage_utils import (
    PACKAGES,
    RESTART_MAP,
    SWIFT_SVCS,
--- a/hooks/init.py
+++ b/hooks/init.py
--- a/hooks/swift_storage_context.py
+++ b/hooks/swift_storage_context.py
--- a/hooks/swift_storage_utils.py
+++ b/hooks/swift_storage_utils.py