From cef1a05beda5a1fdff63b9ccf6595e2764100ba2 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 15 Jul 2014 16:57:34 +0100
Subject: [PATCH] Tidy lint

---
 hooks/keystone_hooks.py           |  3 +--
 hooks/keystone_utils.py           | 12 +++++++-----
 unit_tests/test_keystone_hooks.py |  2 +-
 unit_tests/test_utils.py          |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/hooks/keystone_hooks.py b/hooks/keystone_hooks.py
index 12731b7d..1dca8be2 100755
--- a/hooks/keystone_hooks.py
+++ b/hooks/keystone_hooks.py
@@ -55,7 +55,6 @@ from keystone_utils import (
 
 from charmhelpers.contrib.hahelpers.cluster import (
     eligible_leader,
-    get_hacluster_config,
     is_leader,
 )
 
@@ -228,7 +227,7 @@ def ha_joined():
 
     if len(vip_group) > 1:
         relation_set(groups={'grp_glance_vips': ' '.join(vip_group)})
-    
+
     init_services = {
         'res_ks_haproxy': 'haproxy'
     }
diff --git a/hooks/keystone_utils.py b/hooks/keystone_utils.py
index c07bd624..1015063c 100644
--- a/hooks/keystone_utils.py
+++ b/hooks/keystone_utils.py
@@ -518,7 +518,7 @@ def create_keystone_endpoint(public_ip, service_port,
         internal_ip = "[{}]".format(internal_ip)
     if is_ipv6(admin_ip):
         admin_ip = "[{}]".format(admin_ip)
-        
+
     public_url = "%s://%s:%s/v2.0" % (proto, public_ip, service_port)
     admin_url = "%s://%s:%s/v2.0" % (proto, admin_ip, auth_port)
     internal_url = "%s://%s:%s/v2.0" % (proto, internal_ip, service_port)
@@ -644,10 +644,12 @@ def add_service_to_keystone(relation_id=None, remote_unit=None):
                 relation_data["auth_host"] = config('vip')
                 relation_data["service_host"] = config('vip')
             else:
-                relation_data["auth_host"] = get_address_in_network(config('os-admin-network'),
-                                                                    unit_private_ip())
-                relation_data["service_host"] = get_address_in_network(config('os-public-network'),
-                                                                       unit_private_ip())
+                relation_data["auth_host"] = \
+                    get_address_in_network(config('os-admin-network'),
+                                           unit_private_ip())
+                relation_data["service_host"] = \
+                    get_address_in_network(config('os-public-network'),
+                                           unit_private_ip())
             if https():
                 relation_data["auth_protocol"] = "https"
                 relation_data["service_protocol"] = "https"
diff --git a/unit_tests/test_keystone_hooks.py b/unit_tests/test_keystone_hooks.py
index 187f5b4c..8f3eaf86 100644
--- a/unit_tests/test_keystone_hooks.py
+++ b/unit_tests/test_keystone_hooks.py
@@ -62,7 +62,7 @@ TO_PATCH = [
     'time',
     # ip
     'get_iface_for_address',
-    'get_netmask_for_address',    
+    'get_netmask_for_address',
 ]
 
 
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index e1e346b1..526a61f7 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -80,9 +80,9 @@ class TestConfig(object):
         return self.config
 
     def set(self, attr, value):
-            if attr not in self.config:
-                raise KeyError
-            self.config[attr] = value
+        if attr not in self.config:
+            raise KeyError
+        self.config[attr] = value
 
 
 class TestRelation(object):