From 811c6535586e9b612ef0f70a0e440e476317da1a Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Tue, 12 Sep 2017 09:28:51 +0200
Subject: [PATCH] Fix docs for maintainer label/instruction

Ie87a1ddf31aefcd0b623fd2837d78de420e76898 introduced the maintainer label.

Change-Id: I9ea982b34e9569a8c8d3cdc552a3000f8f8d2685
---
 doc/CONTRIBUTING.rst   | 2 +-
 kolla/common/config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst
index 47aea8e043..7b6ce18f4c 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 549db81b5a..2ba933a7ee 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) '