diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-29 07:50:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-29 07:50:30 +0000 |
| commit | 044a6afffcacae6680d964c8b28857c6945e4b95 (patch) | |
| tree | 96ca74bfcf423d6d5d511bca2377b8ea8b112528 /kolla | |
| parent | 6aa5cd7d98bf58853548cf18bf58654f34ad082e (diff) | |
| parent | 661f2a45c26de322000ac6739bb1cea9c4b761d6 (diff) | |
| download | kolla-044a6afffcacae6680d964c8b28857c6945e4b95.tar.gz kolla-044a6afffcacae6680d964c8b28857c6945e4b95.zip | |
Merge "Remove --include-header and --include-footer parameter"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | kolla/image/build.py | 8 |
2 files changed, 0 insertions, 20 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index b5f00d6b9..42c4b3ae4 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -76,18 +76,6 @@ _CLI_OPTS = [ help='Turn on debugging log level'), cfg.DictOpt('build-args', help='Set docker build time variables'), - cfg.StrOpt('include-header', short='i', - deprecated_for_removal=True, - deprecated_reason=('Use a header block within a template' - ' overrides file instead'), - help=('Path to custom file to be added at ' - 'beginning of base Dockerfile')), - cfg.StrOpt('include-footer', short='I', - deprecated_for_removal=True, - deprecated_reason=('Use a footer block within a template' - ' overrides file instead'), - help=('Path to custom file to be added at ' - 'end of Dockerfiles for final images')), cfg.BoolOpt('keep', default=False, help='Keep failed intermediate containers'), cfg.BoolOpt('list-dependencies', short='l', diff --git a/kolla/image/build.py b/kolla/image/build.py index 55ff7a11e..f84193be5 100644..100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -526,8 +526,6 @@ class KollaWorker(object): self.image_prefix = self.base + '-' + self.install_type + '-' - self.include_header = conf.include_header - self.include_footer = conf.include_footer self.regex = conf.regex self.image_statuses_bad = dict() self.image_statuses_good = dict() @@ -669,12 +667,6 @@ class KollaWorker(object): env.filters.update(self._get_filters()) env.globals.update(self._get_methods()) template = env.get_template(template_name) - if self.include_header: - with open(self.include_header, 'r') as f: - values['include_header'] = f.read() - if self.include_footer: - with open(self.include_footer, 'r') as f: - values['include_footer'] = f.read() content = template.render(values) content_path = os.path.join(path, 'Dockerfile') with open(content_path, 'w') as f: |