Skip to content
Snippets Groups Projects
Commit bd8d7951 authored by Suhail Syed's avatar Suhail Syed Committed by Sam Yaple
Browse files

Modified build.py to run from installed location


Modified build.py to run from installed location or developer
environment. To run from development environment, run the
command:

sudo pip install -e .

Additionally, remove a TODO that has been done

Co-Authored-By: default avatarSam Yaple <sam@yaple.net>
Change-Id: I922696ba439da2c9747e65cddcba47203e54d220
Implements: blueprint python-package
parent d3872aa9
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# TODO(SamYaple): Single image building w/ optional parent building
# TODO(jpeeler): Add clean up handler for SIGINT
import argparse
......@@ -41,6 +40,10 @@ LOG.setLevel(logging.INFO)
signal.signal(signal.SIGINT, signal.SIG_DFL)
class KollaDirNotFoundException(Exception):
pass
class WorkerThread(Thread):
def __init__(self, queue, args):
......@@ -189,9 +192,20 @@ def argParser():
class KollaWorker(object):
def __init__(self, args):
self.kolla_dir = os.path.join(sys.path[0], '..')
self.images_dir = os.path.join(self.kolla_dir, 'docker')
self.templates_dir = os.path.join(self.kolla_dir, 'docker_templates')
def find_base_dir():
if os.path.basename(sys.path[0]) == 'tests':
return os.path.join(sys.path[0], '..')
if os.path.basename(sys.path[0]) == 'cmd':
return os.path.join(sys.path[0], '..', '..')
if os.path.basename(sys.path[0]) == 'bin':
return '/usr/share/kolla'
raise KollaDirNotFoundException(
'I do not know where your Kolla directory is'
)
self.base_dir = find_base_dir()
self.images_dir = os.path.join(self.base_dir, 'docker')
self.templates_dir = os.path.join(self.base_dir, 'docker_templates')
self.namespace = args['namespace']
self.template = args['template']
self.base = args['base']
......@@ -200,7 +214,7 @@ class KollaWorker(object):
self.tag = args['tag']
self.prefix = self.base + '-' + self.type_ + '-'
self.config = ConfigParser.SafeConfigParser()
self.config.read(os.path.join(sys.path[0], '..', 'build.ini'))
self.config.read(os.path.join(sys.path[0], self.base_dir, 'build.ini'))
self.include_header = args['include_header']
self.regex = args['regex']
......
../kolla/cmd/build.py
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment