Merge pull request #4 from mrkz/fix_tox

Fix tox issues

clearstack/common/util.py

@@ -226,8 +226,9 @@ def find_my_ip_from_config(config_ips):
 
 
 def is_localhost(host):
-    return (host == "localhost" or host == socket.gethostname()
-            or host in get_ips())
+    return (host == "localhost" or
+            host == socket.gethostname() or
+            host in get_ips())
 
 
 def has_localhost(hosts):

clearstack/modules/neutron.py

@@ -234,11 +234,11 @@ class Neutron(OpenStackService):
 
     def create_router(self, router, gw, interfaces):
         try:
-            LOG.debug("checking if router '{0}' exists".format(name))
+            LOG.debug("checking if router '{0}' exists".format(router))
             util.run_command("neutron router-show %s" % router,
                              environ=self._env)
         except:
-            LOG.debug("creating router '{0}'".format(name))
+            LOG.debug("creating router '{0}'".format(router))
             util.run_command("neutron router-create %s" % router,
                              environ=self._env)
             util.run_command("neutron router-gateway-set %s %s"

clearstack/modules/rabbitmq.py

@@ -69,6 +69,7 @@ class Rabbitmq:
                          .format(user))
 
     def set_permissions(self, auth_user, permissions):
-        LOG.debug("setting rabbitmq permissions for user '{0}'".format(auth_user))
+        LOG.debug("setting rabbitmq permissions for "
+                  "user '{0}'".format(auth_user))
         util.run_command("rabbitmqctl set_permissions {0} {1}"
                          .format(auth_user, permissions))

clearstack/modules/swift.py

@@ -88,7 +88,7 @@ class Swift(OpenStackService):
             with open(name, 'wb') as f:
                 f.seek(1024 * 1024 * 1024 * size - 1)
                 f.write(b"\0")
-            LOG.("formatting '{0}' as XFS".format(name))
+            LOG.debug("formatting '{0}' as XFS".format(name))
             util.run_command("mkfs.xfs %s" % name)
 
         devs = CONF['CONFIG_SWIFT_STORAGES']