openstack/kolla-ansible
Code Issues Proposed changes

Merge "Mark include-footer and include-header deprecated for removal"

Browse Source
This commit is contained in:
Jenkins 2016-09-22 07:01:41 +00:00 committed by Gerrit Code Review
commit 9f1f735b4e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kolla/common/config.py
View File

@ -76,9 +76,15 @@ _CLI_OPTS = [
cfg.DictOpt('build-args', cfg.DictOpt('build-args',
help='Set docker build time variables'), help='Set docker build time variables'),
cfg.StrOpt('include-header', short='i', 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 ' help=('Path to custom file to be added at '
'beginning of base Dockerfile')), 'beginning of base Dockerfile')),
cfg.StrOpt('include-footer', short='I', 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 ' help=('Path to custom file to be added at '
'end of Dockerfiles for final images')), 'end of Dockerfiles for final images')),
cfg.BoolOpt('keep', default=False, cfg.BoolOpt('keep', default=False,

5
releasenotes/notes/deprecated-include-header-and-footer-71f16045920b0100.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- deprecated --include-header and --include-footer parameter
upgrade:
- should move use header and footer block in template overrides file