openstack
/
kolla
Code Issues Proposed changes

Merge "do not play with PROJECT_ROOT in build.py"

This commit is contained in:
Zuul 2022-10-07 05:53:37 +00:00 committed by Gerrit Code Review
parent cd08d9b543 e2c061ee63
commit 35a28eb209
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kolla/image/build.py
View File

@ -13,35 +13,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: