diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-23 14:12:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-23 14:12:33 +0000 |
| commit | 7f2d46278f2570fc18f5871ebc4f6433acec98a9 (patch) | |
| tree | 9ecea4d56d9a8fc4956cf947915f421f19d8a803 /kolla | |
| parent | c769ccffaec93929cd821f08d2de44674a5feb82 (diff) | |
| parent | 59a1c8b9fb91c3f2510b41858431e9a8a935e830 (diff) | |
| download | kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.tar.gz kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.zip | |
Merge "Remove hardcoded MAINTAINER in Dockerfiles"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/cmd/build.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 9ad7104c0..79e674c25 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -242,7 +242,8 @@ def merge_args_and_config(settings_from_config_file): "push": False, "threads": 8, "retries": 3, - "registry": None + "registry": None, + "maintainer": "Kolla Project (https://launchpad.net/kolla)" } defaults.update(settings_from_config_file.items('kolla-build')) parser.set_defaults(**defaults) @@ -361,6 +362,7 @@ class KollaWorker(object): self.image_statuses_bad = dict() self.image_statuses_good = dict() self.image_statuses_unmatched = dict() + self.maintainer = config['maintainer'] def setup_working_dir(self): """Creates a working directory for use while building""" @@ -390,7 +392,8 @@ class KollaWorker(object): 'image_prefix': self.image_prefix, 'install_type': self.install_type, 'namespace': self.namespace, - 'tag': self.tag} + 'tag': self.tag, + 'maintainer': self.maintainer} if self.include_header: with open(self.include_header, 'r') as f: values['include_header'] = f.read() |