Move charmhelpers to separate dir.

.coveragerc

@@ -4,3 +4,4 @@ exclude_lines =
     if __name__ == .__main__.:
 include=
     hooks/glance_*
+    actions/actions.py

actions.yaml

@@ -2,3 +2,7 @@ git-reinstall:
   description: Reinstall glance from the openstack-origin-git repositories.
 openstack-upgrade:
   description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
+pause:
+  description: Pause glance service.
+resume:
+  description: Resume glance service.

actions/charmhelpers

@@ -0,0 +1 @@
+../charmhelpers

actions/git_reinstall.py

@@ -1,8 +1,6 @@
 #!/usr/bin/python
-import sys
-import traceback
 
-sys.path.append('hooks/')
+import traceback
 
 from charmhelpers.contrib.openstack.utils import (
     git_install_requested,
@@ -14,11 +12,11 @@ from charmhelpers.core.hookenv import (
     config,
 )
 
-from glance_utils import (
+from hooks.glance_utils import (
     git_install,
 )
 
-from glance_relations import (
+from hooks.glance_relations import (
     config_changed,
 )
 

actions/hooks

@@ -0,0 +1 @@
+../hooks

actions/openstack_upgrade.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python
-import sys
+
 import traceback
 
-sys.path.append('hooks/')
 
 from charmhelpers.core.hookenv import (
     action_set,
@@ -10,7 +9,7 @@ from charmhelpers.core.hookenv import (
     config
 )
 
-from glance_relations import config_changed
+from hooks.glance_relations import config_changed
 
 from charmhelpers.contrib.openstack.utils import (
     juju_log,
@@ -18,7 +17,7 @@ from charmhelpers.contrib.openstack.utils import (
     openstack_upgrade_available
 )
 
-from glance_utils import (
+from hooks.glance_utils import (
     do_openstack_upgrade,
     register_configs
 )

charm-helpers-hooks.yaml

@@ -1,5 +1,5 @@
 branch: lp:charm-helpers
-destination: hooks/charmhelpers
+destination: charmhelpers
 include:
     - core
     - cli

hooks/charmhelpers

@@ -0,0 +1 @@
+../charmhelpers