diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-31 04:09:59 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-31 04:09:59 +0000 |
| commit | 45f625a73ea67b31460fdb9da74ba8d619383783 (patch) | |
| tree | 5ef1b8c0c5c5738d35e22ae0569ea05d99b166f3 /kolla/cmd | |
| parent | 5f621a4fe900d41f7f11497cac21875da3280386 (diff) | |
| download | kolla-45f625a73ea67b31460fdb9da74ba8d619383783.tar.gz kolla-45f625a73ea67b31460fdb9da74ba8d619383783.zip | |
Remove dest_filename from build.ini
We can, and should, figure out the filename dynamically rather than
hardcode that value in build.ini since it is not actually a
configurable paramater.
Change-Id: I496d6555e9fa356ab09e62063fd707f43ed08121
Closes-Bug: #1490386
Diffstat (limited to 'kolla/cmd')
| -rwxr-xr-x | kolla/cmd/build.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index ed1de0035..17142b54b 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -89,7 +89,7 @@ class WorkerThread(Thread): def process_source(self, image): source = image['source'] dest_dir = image['path'] - dest_tar = os.path.join(dest_dir, source['dest']) + dest_tar = os.path.join(dest_dir, image['name'] + '.tar') if source.get('type') == 'url': LOG.debug("{}:Getting tarball from {}".format(image['name'], @@ -135,7 +135,7 @@ class WorkerThread(Thread): return # Set time on destination tarball to epoch 0 - os.utime(os.path.join(dest_dir, source['dest']), (0, 0)) + os.utime(dest_tar, (0, 0)) def builder(self, image): LOG.debug('{}:Processing'.format(image['name'])) @@ -440,8 +440,6 @@ class KollaWorker(object): 'type') image['source']['source'] = self.config.get(image['name'], 'location') - image['source']['dest'] = self.config.get(image['name'], - 'dest_filename') if image['source']['type'] == 'git': image['source']['reference'] = \ self.config.get(image['name'], 'reference') |