openstack/kolla
Code Issues Proposed changes

Fix docs for maintainer label/instruction

Browse Source 
Ie87a1ddf31aefcd0b623fd2837d78de420e76898 introduced the maintainer label.

Change-Id: I9ea982b34e9569a8c8d3cdc552a3000f8f8d2685
This commit is contained in:
Christian Berendt 2017-09-12 09:28:51 +02:00
parent 5380724930
commit 811c653558
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/CONTRIBUTING.rst
View File

@ -68,7 +68,7 @@ common to every Dockerfile. The overall structure for a multi container service
is as follows:: is as follows::
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block << service >>_header %}{% endblock %} {% block << service >>_header %}{% endblock %}

2
kolla/common/config.py
View File

@ -263,7 +263,7 @@ _CLI_OPTS = [
_BASE_OPTS = [ _BASE_OPTS = [
cfg.StrOpt('maintainer', cfg.StrOpt('maintainer',
default='Kolla Project (https://launchpad.net/kolla)', default='Kolla Project (https://launchpad.net/kolla)',
help='The MAINTAINER field'), help='Content of the maintainer label'),
cfg.ListOpt('rpm_setup_config', default=[DELOREAN, cfg.ListOpt('rpm_setup_config', default=[DELOREAN,
DELOREAN_DEPS[hostarch]], DELOREAN_DEPS[hostarch]],
help=('Comma separated list of .rpm or .repo file(s) ' help=('Comma separated list of .rpm or .repo file(s) '