Merge "Add header blocks to all Dockerfiles"

docker/aodh/aodh-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block aodh_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/aodh/aodh-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block aodh_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/aodh/aodh-evaluator/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block aodh_evaluator_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/aodh/aodh-expirer/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block aodh_expirer_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/aodh/aodh-listener/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block aodh_listener_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/aodh/aodh-notifier/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}aodh-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block aodh_notifier_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/barbican/barbican-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block barbican_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/barbican/barbican-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block barbican_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/barbican/barbican-keystone-listener/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block barbican_keystone_listener_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/barbican/barbican-worker/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}barbican-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block barbican_worker_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block bifrost_base_header %}{% endblock %}
+
 {% if install_type == 'binary' %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/false

docker/bifrost/bifrost-deploy/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}bifrost-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block bifrost_deploy_header %}{% endblock %}
+
 ENV container docker
 
 {% import "macros.j2" as macros with context %}

docker/ceilometer/ceilometer-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceilometer/ceilometer-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceilometer/ceilometer-central/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_central_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceilometer/ceilometer-collector/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_collector_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceilometer/ceilometer-compute/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_compute_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceilometer/ceilometer-notification/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceilometer_notification_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ceph/ceph-base/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block ceph_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/ceph/ceph-mon/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_mon_header %}{% endblock %}
+
 COPY fetch_ceph_keys.py /usr/bin/
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start

docker/ceph/ceph-osd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_osd_header %}{% endblock %}
+
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
 

docker/ceph/ceph-rgw/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ceph_rgw_header %}{% endblock %}
+
 {% block ceph_rgw_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}

docker/cinder/cinder-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cinder/cinder-backup/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_backup_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cinder/cinder-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cinder/cinder-rpcbind/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_rpcbind_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/cinder/cinder-scheduler/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_scheduler_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cinder/cinder-volume/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cinder_volume_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/cloudkitty/cloudkitty-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cloudkitty_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cloudkitty/cloudkitty-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cloudkitty_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/cloudkitty/cloudkitty-processor/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block cloudkitty_processor_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/collectd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block collectd_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% set collectd_packages = ['collectd'] %}

docker/congress/congress-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block congress_api_header %}{% endblock %}
+
 COPY extend_start.sh /usr/local/bin/kolla_congress_extend_start
 RUN chmod 755 /usr/local/bin/kolla_congress_extend_start
 

docker/congress/congress-base/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix}}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block congress_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/congress/congress-datasource/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block congress_datasource_header %}{% endblock %}
+
 {% block congress_datasource_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}

docker/congress/congress-policy-engine/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}congress-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block congress_policy_engine_header %}{% endblock %}
+
 {% block congress_policy_engine_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}

docker/cron/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block cron_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/designate/designate-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-backend-bind9/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_backend_bind9_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-base/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-central/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_central_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-mdns/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_mdns_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-pool-manager/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_pool_manager_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/designate/designate-sink/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block designate_sink_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/dind/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block dind_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/elasticsearch/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block elasticsearch_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/etcd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block etcd_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/glance/glance-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block glance_api_header %}{% endblock %}
+
 COPY extend_start.sh /usr/local/bin/kolla_glance_extend_start
 RUN chmod 755 /usr/local/bin/kolla_glance_extend_start
 

docker/glance/glance-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block glance_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/glance/glance-registry/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block glance_registry_header %}{% endblock %}
+
 {% block glance_registry_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}

docker/gnocchi/gnocchi-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block gnocchi_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/gnocchi/gnocchi-base/Dockerfile.j2

@@ -1,13 +1,15 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block gnocchi_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
-       
+
        {% set gnocchi_base_packages = [
-            'openstack-gnocchi-common', 
+            'openstack-gnocchi-common',
             'python-gnocchiclient',
             'httpd',
             'mod_wsgi',
@@ -19,7 +21,7 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
     && cp -a /usr/lib/python2.7/site-packages/gnocchi/rest/app.wsgi /var/www/cgi-bin/gnocchi/app \
     && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
     {% elif base_distro in ['ubuntu'] %}
-       
+
        {% set gnocchi_base_packages = [
             'gnocchi-common',
             'apache2',
@@ -35,7 +37,7 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
     {% endif %}
 {% elif install_type == 'source' %}
     {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
-       
+
        {% set gnocchi_base_packages = [
             'httpd',
             'mod_wsgi',
@@ -45,7 +47,7 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
 RUN mkdir -p /var/www/cgi-bin/gnocchi \
     && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
     {% elif base_distro in ['ubuntu', 'debian'] %}
-       
+
        {% set gnocchi_base_packages = [
             'apache2',
             'libapache2-mod-wsgi',
@@ -76,6 +78,6 @@ RUN usermod -a -G kolla gnocchi \
     && chmod 640 /etc/sudoers.d/kolla_gnocchi_sudoers \
     && chmod 755 /var/www/cgi-bin/gnocchi \
     && touch /usr/local/bin/kolla_gnocchi_extend_start \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start 
+    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_gnocchi_extend_start
 
 {% block gnocchi_base_footer %}{% endblock %}

docker/gnocchi/gnocchi-metricd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block gnocchi_metricd_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/gnocchi/gnocchi-statsd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block gnocchi_statsd_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/haproxy/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block haproxy_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% set haproxy_packages = ['haproxy'] %}

docker/heat/heat-api-cfn/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block heat_api_cfn_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/heat/heat-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block heat_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/heat/heat-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block heat_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/heat/heat-engine/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block heat_engine_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/heka/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block heka_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/horizon/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block horizon_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/influxdb/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block influxdb_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% set influxdb_packages = ['influxdb'] %}

docker/ironic/ironic-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ironic_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ironic/ironic-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ironic_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ironic_conductor_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ironic/ironic-inspector/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ironic_inspector_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block ironic_pxe_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/iscsid/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block iscsid_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/keepalived/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block keepalived_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/keystone/keystone-base/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block keystone_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/keystone/keystone-fernet/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block keystone_fernet_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}

docker/keystone/keystone-ssh/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block keystone_ssh_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/keystone/keystone/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}keystone-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block keystone_header %}{% endblock %}
+
 COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap

docker/kibana/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block kibana_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 RUN useradd -r -m --user-group kibana \

docker/kolla-toolbox/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block kolla_toolbox_header %}{% endblock %}
+
 {% set os_client_config='/usr/lib/python2.7/site-packages/os_client_config/defaults.json' %}
 
 {% import "macros.j2" as macros with context %}

docker/kuryr/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block kuryr_header %}{% endblock %}
+
 {% if install_type == 'binary' %}
 
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \

docker/magnum/magnum-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block magnum_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/magnum/magnum-base/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block magnum_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/magnum/magnum-conductor/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block magnum_conductor_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/manila/manila-api/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block manila_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/manila/manila-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block manila_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/manila/manila-scheduler/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block manila_scheduler_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/manila/manila-share/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block manila_share_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/mariadb/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block mariadb_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/memcached/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block memcached_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/mistral/mistral-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block mistral_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/mistral/mistral-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block mistral_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/mistral/mistral-engine/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block mistral_engine_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/mistral/mistral-executor/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}mistral-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block mistral_executor_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/mongodb/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block mongodb_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/multipathd/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block multipathd_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

docker/murano/murano-api/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block murano_api_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/murano/murano-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block murano_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/murano/murano-engine/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block murano_engine_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/neutron/neutron-base/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block neutron_base_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/neutron/neutron-dhcp-agent/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block neutron_dhcp_agent_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['ubuntu', 'debian'] %}

docker/neutron/neutron-l3-agent/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block neutron_l3_agent_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/neutron/neutron-lbaas-agent/Dockerfile.j2

@@ -1,5 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
 MAINTAINER {{ maintainer }}
+
+{% block neutron_lbaas_agent_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% set neutron_lbaas_agent_packages = [

docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block neutron_linuxbridge_agent_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if install_type == 'binary' %}

docker/neutron/neutron-metadata-agent/Dockerfile.j2

@@ -1,6 +1,8 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
 MAINTAINER {{ maintainer }}
 
+{% block neutron_metadata_agent_header %}{% endblock %}
+
 {% import "macros.j2" as macros with context %}
 
 {% if base_distro in ['ubuntu', 'debian'] %}