openstack/kolla-ansible
Code Issues Proposed changes

Modified build.py to run from installed location

Browse Source 
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: Sam Yaple <sam@yaple.net>
Change-Id: I922696ba439da2c9747e65cddcba47203e54d220
Implements: blueprint python-package
This commit is contained in:
Suhail Syed 2015-08-24 15:58:33 -07:00 committed by Sam Yaple
parent d3872aa9ee
commit bd8d795124
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kolla/cmd/build.py
View File

@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# TODO(SamYaple): Single image building w/ optional parent building
# TODO(jpeeler): Add clean up handler for SIGINT # TODO(jpeeler): Add clean up handler for SIGINT
import argparse import argparse
@ -41,6 +40,10 @@ LOG.setLevel(logging.INFO)
signal.signal(signal.SIGINT, signal.SIG_DFL) signal.signal(signal.SIGINT, signal.SIG_DFL)
class KollaDirNotFoundException(Exception):
pass
class WorkerThread(Thread): class WorkerThread(Thread):
def __init__(self, queue, args): def __init__(self, queue, args):
@ -189,9 +192,20 @@ def argParser():
class KollaWorker(object): class KollaWorker(object):
def __init__(self, args): def __init__(self, args):
self.kolla_dir = os.path.join(sys.path[0], '..') def find_base_dir():
self.images_dir = os.path.join(self.kolla_dir, 'docker') if os.path.basename(sys.path[0]) == 'tests':
self.templates_dir = os.path.join(self.kolla_dir, 'docker_templates') 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.namespace = args['namespace']
self.template = args['template'] self.template = args['template']
self.base = args['base'] self.base = args['base']
@ -200,7 +214,7 @@ class KollaWorker(object):
self.tag = args['tag'] self.tag = args['tag']
self.prefix = self.base + '-' + self.type_ + '-' self.prefix = self.base + '-' + self.type_ + '-'
self.config = ConfigParser.SafeConfigParser() 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.include_header = args['include_header']
self.regex = args['regex'] self.regex = args['regex']

1
tools/build.py Symbolic link
View File

@ -0,0 +1 @@
../kolla/cmd/build.py