From 9660b5786484172bd42c7fac332aa500fdc1790f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 2 Sep 2016 09:56:56 +0200
Subject: [PATCH] Consistently set sys path when using local tools
Consistently set 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.
TrivialFix
Change-Id: Idd1d98bb82a8f1ddb32d1bdb23f346b461534b9f
---
kolla/cmd/build.py | 3 +++
kolla/cmd/genpwd.py | 9 +++++++++
kolla/image/build.py | 8 +++-----
tools/version-check.py | 7 +++----
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index d0d6ab7d94..4674de7622 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -15,6 +15,9 @@
import os
import sys
+# 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:
diff --git a/kolla/cmd/genpwd.py b/kolla/cmd/genpwd.py
index 288b35036b..e548b9ab43 100755
--- a/kolla/cmd/genpwd.py
+++ b/kolla/cmd/genpwd.py
@@ -16,11 +16,20 @@ import argparse
import os
import random
import string
+import sys
import uuid
import yaml
from Crypto.PublicKey import RSA
+# 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)
+
def generate_RSA(bits=4096):
new_key = RSA.generate(bits, os.urandom)
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 6c8aa857e5..8b2a1943d0 100644
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -38,13 +38,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)
diff --git a/tools/version-check.py b/tools/version-check.py
index 9477762b0c..58aa03e6ea 100755
--- a/tools/version-check.py
+++ b/tools/version-check.py
@@ -24,12 +24,11 @@ import pkg_resources
import prettytable
import requests
+# 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)