diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-19 17:18:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-19 17:18:16 +0000 |
| commit | 4469ec1ada319149ffd0f13615ca6f58948e6fa2 (patch) | |
| tree | 516c20a87b0d59275250384797603204bfc3c1a8 | |
| parent | f5032ac58189944decef39410ce214def7492788 (diff) | |
| parent | 811c6535586e9b612ef0f70a0e440e476317da1a (diff) | |
| download | kolla-4469ec1ada319149ffd0f13615ca6f58948e6fa2.tar.gz kolla-4469ec1ada319149ffd0f13615ca6f58948e6fa2.zip | |
Merge "Fix docs for maintainer label/instruction"
| -rw-r--r-- | doc/CONTRIBUTING.rst | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst index 47aea8e04..7b6ce18f4 100644 --- a/doc/CONTRIBUTING.rst +++ b/doc/CONTRIBUTING.rst @@ -68,7 +68,7 @@ common to every Dockerfile. The overall structure for a multi container service is as follows:: FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} - MAINTAINER {{ maintainer }} + LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% block << service >>_header %}{% endblock %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 549db81b5..2ba933a7e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -263,7 +263,7 @@ _CLI_OPTS = [ _BASE_OPTS = [ cfg.StrOpt('maintainer', default='Kolla Project (https://launchpad.net/kolla)', - help='The MAINTAINER field'), + help='Content of the maintainer label'), cfg.ListOpt('rpm_setup_config', default=[DELOREAN, DELOREAN_DEPS[hostarch]], help=('Comma separated list of .rpm or .repo file(s) ' |