diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-10-06 13:10:51 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-10-06 18:21:16 +0200 |
| commit | e2c061ee63a701284bc2f6b1470d9d33a58e724c (patch) | |
| tree | c3984edd208370da555f820d395a0c5d9e7468ce | |
| parent | 145d096bf7d93e200cd567f8177f09fd8492de61 (diff) | |
| download | kolla-e2c061ee63a701284bc2f6b1470d9d33a58e724c.tar.gz kolla-e2c061ee63a701284bc2f6b1470d9d33a58e724c.zip | |
do not play with PROJECT_ROOT in build.py
PROJECT_ROOT mangling is already done in kolla/cmd/build.py (which is
called as 'kolla-build' or 'tools/build.py' or directly) so it is not
needed here.
Now we can sort imports and drop not needed ones.
Change-Id: Iac6ea537491e5c00ce6fb4b4e8f07a9124e9fa8b
| -rwxr-xr-x | kolla/image/build.py | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 23f818179..a55fe266b 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -15,35 +15,20 @@ import contextlib import json import logging -import os import queue import shutil import sys import threading import time +from kolla.common import config as common_config +from kolla.common import utils +from kolla.image.kolla_worker import KollaWorker +from kolla.image.utils import LOG +from kolla.image.utils import Status from oslo_config import cfg -# NOTE(SamYaple): Update the search path to prefer PROJECT_ROOT as the source -# of packages to import if we are using local tools instead of -# pip installed kolla tools -PROJECT_ROOT = os.path.abspath(os.path.join( - os.path.dirname(os.path.realpath(__file__)), '../..')) -if PROJECT_ROOT not in sys.path: - sys.path.insert(0, PROJECT_ROOT) - -from kolla.common import config as common_config # noqa -from kolla.common import utils # noqa -from kolla.image.kolla_worker import KollaWorker # noqa -from kolla.image.utils import LOG # noqa -from kolla.image.utils import Status # noqa -from kolla import exception # noqa -from kolla.template import filters as jinja_filters # noqa -from kolla.template import methods as jinja_methods # noqa -from kolla import version # noqa - - @contextlib.contextmanager def join_many(threads): try: |
