diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-22 07:01:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-22 07:01:41 +0000 |
| commit | 9f1f735b4eb43b461646abe902dc3a28caa3b2a0 (patch) | |
| tree | 5b2be248c83bc0edf269791912268bfc7f476c83 | |
| parent | 57adbe73a7b8bd644ccfa3dae39b1a1ab53b5ed2 (diff) | |
| parent | ae54ae8ef0de840cb0a169536905576a147d1449 (diff) | |
| download | kolla-9f1f735b4eb43b461646abe902dc3a28caa3b2a0.tar.gz kolla-9f1f735b4eb43b461646abe902dc3a28caa3b2a0.zip | |
Merge "Mark include-footer and include-header deprecated for removal"
| -rw-r--r-- | kolla/common/config.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/deprecated-include-header-and-footer-71f16045920b0100.yaml | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index e66171c7d..525c45dea 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -76,9 +76,15 @@ _CLI_OPTS = [ 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, diff --git a/releasenotes/notes/deprecated-include-header-and-footer-71f16045920b0100.yaml b/releasenotes/notes/deprecated-include-header-and-footer-71f16045920b0100.yaml new file mode 100644 index 000000000..bad40a0d1 --- /dev/null +++ b/releasenotes/notes/deprecated-include-header-and-footer-71f16045920b0100.yaml @@ -0,0 +1,5 @@ +--- +features: + - deprecated --include-header and --include-footer parameter +upgrade: + - should move use header and footer block in template overrides file |