diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-19 16:02:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-19 16:02:12 +0000 |
| commit | 039eb8d79a8602fc4055ff01b1c8709ba54a26bc (patch) | |
| tree | 14542ef986b8c33ec18aa4acf597583c96da217e /kolla/image | |
| parent | 683305ddbf080d014d4bda85b7ffc2b40a6ef8b6 (diff) | |
| parent | 9660b5786484172bd42c7fac332aa500fdc1790f (diff) | |
| download | kolla-039eb8d79a8602fc4055ff01b1c8709ba54a26bc.tar.gz kolla-039eb8d79a8602fc4055ff01b1c8709ba54a26bc.zip | |
Merge "Consistently set sys path when using local tools"
Diffstat (limited to 'kolla/image')
| -rw-r--r-- | kolla/image/build.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 07efe0f02..916272c0c 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -37,13 +37,11 @@ from oslo_config import cfg from requests import exceptions as requests_exc import six - +# 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__)), '../..')) - -# NOTE(SamYaple): Update the search patch to prefer PROJECT_ROOT as the source -# of packages to import if we are using local tools/build.py -# instead of pip installed kolla-build tool if PROJECT_ROOT not in sys.path: sys.path.insert(0, PROJECT_ROOT) |