From 6c5aeeee41b8e4b0fe7fb246bf9b8a0c35613232 Mon Sep 17 00:00:00 2001 From: Martin André Date: Mon, 21 Sep 2015 20:12:45 +0900 Subject: Consolidate kolla-build configuration in one file The source location definition previously in build.ini was merged in etc/kolla/kolla-build.conf since it is really configuration for the kolla-build tool. Change-Id: I7531af0029bdfeabbaefb8a6aa97b70bb12c021a Closes-Bug: #1496702 --- kolla/cmd/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kolla/cmd') 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() -- cgit v1.2.3