Merge lp:~james-page/charm-helpers/fixup_hahelpers into lp:charm-helpers

[James Page]

Fixup imports in hahelpers

The imports are all package local so no hahelper prefix required.

Also fixed up the get_host_ip function to not call unit_get in
the function definition, but in the function instead.

=== modified file 'charmhelpers/contrib/hahelpers/apache_utils.py'
--- charmhelpers/contrib/hahelpers/apache_utils.py	2013-05-30 23:26:24 +0000
+++ charmhelpers/contrib/hahelpers/apache_utils.py	2013-06-12 08:27:26 +0000
@@ -8,7 +8,7 @@
 #  Adam Gandelman <[e-mail]>
 #
 
-from hahelpers.utils import (
+from utils import (
     relation_ids,
     relation_list,
     relation_get,
@@ -19,7 +19,7 @@
     get_host_ip,
     restart
     )
-from hahelpers.cluster_utils import https
+from cluster_utils import https
 
 import os
 import subprocess
 
=== modified file 'charmhelpers/contrib/hahelpers/ceph_utils.py'
--- charmhelpers/contrib/hahelpers/ceph_utils.py	2013-05-30 23:26:24 +0000
+++ charmhelpers/contrib/hahelpers/ceph_utils.py	2013-06-12 08:27:26 +0000
@@ -12,7 +12,7 @@
 import subprocess
 import os
 import shutil
-import hahelpers.utils as utils
+import utils
 
 KEYRING = '/etc/ceph/ceph.client.%s.keyring'
 KEYFILE = '/etc/ceph/ceph.client.%s.key'
 
=== modified file 'charmhelpers/contrib/hahelpers/cluster_utils.py'
--- charmhelpers/contrib/hahelpers/cluster_utils.py	2013-05-30 23:26:24 +0000
+++ charmhelpers/contrib/hahelpers/cluster_utils.py	2013-06-12 08:27:26 +0000
@@ -8,7 +8,7 @@
 #  Adam Gandelman <[e-mail]>
 #
 
-from hahelpers.utils import (
+from utils import (
     juju_log,
     relation_ids,
     relation_list,
 
=== modified file 'charmhelpers/contrib/hahelpers/haproxy_utils.py'
--- charmhelpers/contrib/hahelpers/haproxy_utils.py	2013-05-30 23:26:24 +0000
+++ charmhelpers/contrib/hahelpers/haproxy_utils.py	2013-06-12 08:27:26 +0000
@@ -8,7 +8,7 @@
 #  Adam Gandelman <[e-mail]>
 #
 
-from lib.utils import (
+from utils import (
     relation_ids,
     relation_list,
     relation_get,
 
=== modified file 'charmhelpers/contrib/hahelpers/utils.py'
--- charmhelpers/contrib/hahelpers/utils.py	2013-06-11 18:22:54 +0000
+++ charmhelpers/contrib/hahelpers/utils.py	2013-06-12 08:27:26 +0000
@@ -270,7 +270,8 @@
 
 
 @cached
-def get_host_ip(hostname=unit_get('private-address')):
+def get_host_ip(hostname=None):
+    hostname = hostname or unit_get('private-address')
     try:
         # Test to see if already an IPv4 address
         socket.inet_aton(hostname)