From 7f1ddbd717e72f40329d72d57d397107c876edd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Tue, 8 Oct 2019 22:21:47 +0200
Subject: [PATCH] Fix pep8 errors

pep8 is failin in check jobs. This change reorder imports
and updates some doctext to conform the new rules.

Change-Id: I9da3aa38b386ce4dc4f9d9d41bb61c500d179384
(cherry picked from commit d3ca08bb298543811b6b1334907d4c24792b35f8)
---
 instack_undercloud/tests/test_validator.py |  2 +-
 instack_undercloud/undercloud.py           | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/instack_undercloud/tests/test_validator.py b/instack_undercloud/tests/test_validator.py
index 4702e3f74..1734f5038 100644
--- a/instack_undercloud/tests/test_validator.py
+++ b/instack_undercloud/tests/test_validator.py
@@ -14,8 +14,8 @@
 
 import mock
 
-from oslo_config import fixture as config_fixture
 from oslo_config import cfg
+from oslo_config import fixture as config_fixture
 from oslotest import base
 
 from instack_undercloud import undercloud
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index e49db0497..8788b7bf0 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -34,12 +34,12 @@ import time
 import uuid
 
 from ironicclient import client as ir_client
-from keystoneauth1 import session
 from keystoneauth1 import exceptions as ks_exceptions
-from keystoneclient import discover
 import keystoneauth1.identity.generic as ks_auth
-from mistralclient.api import client as mistralclient
+from keystoneauth1 import session
+from keystoneclient import discover
 from mistralclient.api import base as mistralclient_exc
+from mistralclient.api import client as mistralclient
 from novaclient import client as novaclient
 from novaclient import exceptions
 import os_client_config
@@ -746,8 +746,7 @@ def _check_ipv6_enabled():
 
 
 def _wrap_ipv6(ip):
-    """Wrap a IP address in square brackets if IPv6
-    """
+    """Wrap a IP address in square brackets if IPv6"""
     if netutils.is_valid_ipv6(ip):
         return "[%s]" % ip
     return ip
@@ -2463,8 +2462,7 @@ def install(instack_root, upgrade=False):
 
 
 def _is_database_upgrade_needed():
-    """Check whether a yum update will cause an major version update
-       for the database.
+    """Check whether update will cause major version update for the database.
 
     :return whether an update will happen
     :rtype bool