From 661f2a45c26de322000ac6739bb1cea9c4b761d6 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Fri, 25 Nov 2016 00:14:20 -0600 Subject: Remove --include-header and --include-footer parameter In Newton, kolla moved to Dockerfile customization, and the parameters --included-header and --include-footer were marked deprecated. This patch set removes them in the Ocata release. Change-Id: I3263c305bf619ab47a31cf4eafe5d4fcfa4aec17 Closes-Bug: #1643967 --- kolla/common/config.py | 12 ------------ kolla/image/build.py | 8 -------- 2 files changed, 20 deletions(-) mode change 100644 => 100755 kolla/image/build.py (limited to 'kolla') diff --git a/kolla/common/config.py b/kolla/common/config.py index 1c3c5d2e4..efd31bd38 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 old mode 100644 new mode 100755 index 55ff7a11e..f84193be5 --- 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: -- cgit v1.2.3