diff --git a/devstack/component.py b/devstack/component.py index ff1b893d..bbc9d152 100644 --- a/devstack/component.py +++ b/devstack/component.py @@ -15,7 +15,6 @@ # under the License. from devstack import downloader as down -from devstack import exceptions as excp from devstack import log as logging from devstack import pip from devstack import settings diff --git a/devstack/components/glance.py b/devstack/components/glance.py index 11a8ba07..926be802 100644 --- a/devstack/components/glance.py +++ b/devstack/components/glance.py @@ -22,7 +22,6 @@ from devstack import component as comp from devstack import log as logging from devstack import settings from devstack import shell as sh -from devstack import utils from devstack.components import db from devstack.components import keystone diff --git a/devstack/components/keystone_client.py b/devstack/components/keystone_client.py index ce2e543b..c7d76413 100644 --- a/devstack/components/keystone_client.py +++ b/devstack/components/keystone_client.py @@ -17,8 +17,6 @@ from devstack import component as comp from devstack import log as logging from devstack import settings -from devstack import shell as sh -from devstack import utils #id TYPE = settings.KEYSTONE_CLIENT diff --git a/devstack/components/melange_client.py b/devstack/components/melange_client.py index 9fc4b74b..ff94d5f1 100644 --- a/devstack/components/melange_client.py +++ b/devstack/components/melange_client.py @@ -17,8 +17,6 @@ from devstack import component as comp from devstack import log as logging from devstack import settings -from devstack import shell as sh -from devstack import utils #id TYPE = settings.MELANGE_CLIENT diff --git a/devstack/components/nova_client.py b/devstack/components/nova_client.py index d7fb1f9f..a0706836 100644 --- a/devstack/components/nova_client.py +++ b/devstack/components/nova_client.py @@ -17,8 +17,6 @@ from devstack import component as comp from devstack import log as logging from devstack import settings -from devstack import shell as sh -from devstack import utils #id TYPE = settings.NOVA_CLIENT diff --git a/devstack/components/quantum_client.py b/devstack/components/quantum_client.py index 56f3bfe0..b3988539 100644 --- a/devstack/components/quantum_client.py +++ b/devstack/components/quantum_client.py @@ -17,8 +17,6 @@ from devstack import component as comp from devstack import log as logging from devstack import settings -from devstack import shell as sh -from devstack import utils #id TYPE = settings.QUANTUM_CLIENT diff --git a/devstack/components/rabbit.py b/devstack/components/rabbit.py index b6441d12..aaf3fa80 100644 --- a/devstack/components/rabbit.py +++ b/devstack/components/rabbit.py @@ -18,12 +18,10 @@ from tempfile import TemporaryFile import time from devstack import component as comp -from devstack import exceptions as excp from devstack import log as logging from devstack import settings from devstack import shell as sh from devstack import trace as tr -from devstack import utils #id TYPE = settings.RABBIT diff --git a/devstack/components/swift_keystone.py b/devstack/components/swift_keystone.py index 90819af7..643a459b 100644 --- a/devstack/components/swift_keystone.py +++ b/devstack/components/swift_keystone.py @@ -14,14 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. -import os -import os.path - from devstack import component as comp from devstack import log as logging from devstack import settings -from devstack import shell as sh -from devstack import utils # id TYPE = settings.SWIFT_KEYSTONE diff --git a/devstack/opts.py b/devstack/opts.py index b6a5b9b5..f5b4eefb 100644 --- a/devstack/opts.py +++ b/devstack/opts.py @@ -17,7 +17,6 @@ from optparse import IndentedHelpFormatter from optparse import OptionParser, OptionGroup -from devstack import shell as sh from devstack import log as logging from devstack import settings from devstack import version diff --git a/devstack/packaging/yum.py b/devstack/packaging/yum.py index 2ce09178..9429900b 100644 --- a/devstack/packaging/yum.py +++ b/devstack/packaging/yum.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from devstack import exceptions as excp from devstack import log as logging from devstack import packager as pack from devstack import settings diff --git a/devstack/pip.py b/devstack/pip.py index d63925ac..468fbc7c 100644 --- a/devstack/pip.py +++ b/devstack/pip.py @@ -54,7 +54,6 @@ def uninstall(pips, distro, skip_errors=True): pipnames = sorted(pips.keys()) LOG.info("Uninstalling python packages [%s]" % (", ".join(pipnames))) for name in pipnames: - pipinfo = pips.get(name, dict()) try: root_cmd = PIP_CMD_NAMES.get(distro, 'pip') cmd = [root_cmd, 'uninstall'] + PIP_UNINSTALL_CMD_OPTS + [name] diff --git a/devstack/utils.py b/devstack/utils.py index 973d029a..865f7dd2 100644 --- a/devstack/utils.py +++ b/devstack/utils.py @@ -24,7 +24,6 @@ import platform import random import re import termcolor -import traceback from devstack import exceptions as excp from devstack import log as logging