diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-21 19:30:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-21 19:30:20 +0000 |
| commit | 66608efd11c76cbcaca2f7d6775ea5db24ec2cc1 (patch) | |
| tree | b18f5eb8ccfe4d4c0225c3037919dd179d331143 /kolla | |
| parent | 570f688222451af633ba74387a1032a2fcba30be (diff) | |
| parent | 6c5aeeee41b8e4b0fe7fb246bf9b8a0c35613232 (diff) | |
| download | kolla-66608efd11c76cbcaca2f7d6775ea5db24ec2cc1.tar.gz kolla-66608efd11c76cbcaca2f7d6775ea5db24ec2cc1.zip | |
Merge "Consolidate kolla-build configuration in one file"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/cmd/build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 7859d1646..d0972d491 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -296,11 +296,11 @@ class KollaWorker(object): self.type_ = config['type'] self.tag = config['tag'] self.prefix = self.base + '-' + self.type_ + '-' - self.source_location = ConfigParser.SafeConfigParser() - self.source_location.read(os.path.join(self.base_dir, 'build.ini')) self.include_header = config['include_header'] self.include_footer = config['include_footer'] self.regex = config['regex'] + self.source_location = ConfigParser.SafeConfigParser() + self.source_location.read(find_config_file('kolla-build.conf')) self.image_statuses_bad = dict() self.image_statuses_good = dict() |