From b41247c6569974d8b8591070076845e652d684ba Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 7 Sep 2016 18:15:01 +0100 Subject: [PATCH] Add header blocks to all Dockerfiles Change needed to add header blocks to all Dockerfiles, similar to the base. Use case is to easily run something before packages are installed, e.g. to COPY a local rpm in that can be added to the package list. Change-Id: I1bbfdf0b762da0a392aa8bf47781315b45377bee Closes-Bug: 1618969 --- docker/aodh/aodh-api/Dockerfile.j2 | 3 +++ docker/aodh/aodh-base/Dockerfile.j2 | 2 ++ docker/aodh/aodh-evaluator/Dockerfile.j2 | 2 ++ docker/aodh/aodh-expirer/Dockerfile.j2 | 2 ++ docker/aodh/aodh-listener/Dockerfile.j2 | 2 ++ docker/aodh/aodh-notifier/Dockerfile.j2 | 2 ++ docker/barbican/barbican-api/Dockerfile.j2 | 2 ++ docker/barbican/barbican-base/Dockerfile.j2 | 2 ++ .../barbican-keystone-listener/Dockerfile.j2 | 2 ++ docker/barbican/barbican-worker/Dockerfile.j2 | 2 ++ docker/bifrost/bifrost-base/Dockerfile.j2 | 2 ++ docker/bifrost/bifrost-deploy/Dockerfile.j2 | 3 +++ docker/ceilometer/ceilometer-api/Dockerfile.j2 | 2 ++ docker/ceilometer/ceilometer-base/Dockerfile.j2 | 2 ++ docker/ceilometer/ceilometer-central/Dockerfile.j2 | 2 ++ .../ceilometer/ceilometer-collector/Dockerfile.j2 | 2 ++ docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 ++ .../ceilometer-notification/Dockerfile.j2 | 2 ++ docker/ceph/ceph-base/Dockerfile.j2 | 3 +++ docker/ceph/ceph-mon/Dockerfile.j2 | 2 ++ docker/ceph/ceph-osd/Dockerfile.j2 | 2 ++ docker/ceph/ceph-rgw/Dockerfile.j2 | 2 ++ docker/cinder/cinder-api/Dockerfile.j2 | 2 ++ docker/cinder/cinder-backup/Dockerfile.j2 | 2 ++ docker/cinder/cinder-base/Dockerfile.j2 | 2 ++ docker/cinder/cinder-rpcbind/Dockerfile.j2 | 2 ++ docker/cinder/cinder-scheduler/Dockerfile.j2 | 2 ++ docker/cinder/cinder-volume/Dockerfile.j2 | 2 ++ docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 2 ++ docker/cloudkitty/cloudkitty-base/Dockerfile.j2 | 2 ++ .../cloudkitty/cloudkitty-processor/Dockerfile.j2 | 2 ++ docker/collectd/Dockerfile.j2 | 2 ++ docker/congress/congress-api/Dockerfile.j2 | 2 ++ docker/congress/congress-base/Dockerfile.j2 | 3 +++ docker/congress/congress-datasource/Dockerfile.j2 | 2 ++ .../congress/congress-policy-engine/Dockerfile.j2 | 2 ++ docker/cron/Dockerfile.j2 | 3 +++ docker/designate/designate-api/Dockerfile.j2 | 3 +++ .../designate-backend-bind9/Dockerfile.j2 | 3 +++ docker/designate/designate-base/Dockerfile.j2 | 3 +++ docker/designate/designate-central/Dockerfile.j2 | 3 +++ docker/designate/designate-mdns/Dockerfile.j2 | 3 +++ .../designate/designate-pool-manager/Dockerfile.j2 | 3 +++ docker/designate/designate-sink/Dockerfile.j2 | 3 +++ docker/dind/Dockerfile.j2 | 2 ++ docker/elasticsearch/Dockerfile.j2 | 2 ++ docker/etcd/Dockerfile.j2 | 2 ++ docker/glance/glance-api/Dockerfile.j2 | 2 ++ docker/glance/glance-base/Dockerfile.j2 | 2 ++ docker/glance/glance-registry/Dockerfile.j2 | 2 ++ docker/gnocchi/gnocchi-api/Dockerfile.j2 | 3 +++ docker/gnocchi/gnocchi-base/Dockerfile.j2 | 14 ++++++++------ docker/gnocchi/gnocchi-metricd/Dockerfile.j2 | 2 ++ docker/gnocchi/gnocchi-statsd/Dockerfile.j2 | 2 ++ docker/haproxy/Dockerfile.j2 | 2 ++ docker/heat/heat-api-cfn/Dockerfile.j2 | 2 ++ docker/heat/heat-api/Dockerfile.j2 | 3 +++ docker/heat/heat-base/Dockerfile.j2 | 2 ++ docker/heat/heat-engine/Dockerfile.j2 | 2 ++ docker/heka/Dockerfile.j2 | 2 ++ docker/horizon/Dockerfile.j2 | 2 ++ docker/influxdb/Dockerfile.j2 | 3 +++ docker/ironic/ironic-api/Dockerfile.j2 | 2 ++ docker/ironic/ironic-base/Dockerfile.j2 | 2 ++ docker/ironic/ironic-conductor/Dockerfile.j2 | 2 ++ docker/ironic/ironic-inspector/Dockerfile.j2 | 2 ++ docker/ironic/ironic-pxe/Dockerfile.j2 | 2 ++ docker/iscsid/Dockerfile.j2 | 2 ++ docker/keepalived/Dockerfile.j2 | 3 +++ docker/keystone/keystone-base/Dockerfile.j2 | 3 +++ docker/keystone/keystone-fernet/Dockerfile.j2 | 3 +++ docker/keystone/keystone-ssh/Dockerfile.j2 | 3 +++ docker/keystone/keystone/Dockerfile.j2 | 2 ++ docker/kibana/Dockerfile.j2 | 2 ++ docker/kolla-toolbox/Dockerfile.j2 | 2 ++ docker/kuryr/Dockerfile.j2 | 2 ++ docker/magnum/magnum-api/Dockerfile.j2 | 3 +++ docker/magnum/magnum-base/Dockerfile.j2 | 3 +++ docker/magnum/magnum-conductor/Dockerfile.j2 | 3 +++ docker/manila/manila-api/Dockerfile.j2 | 2 ++ docker/manila/manila-base/Dockerfile.j2 | 2 ++ docker/manila/manila-scheduler/Dockerfile.j2 | 2 ++ docker/manila/manila-share/Dockerfile.j2 | 2 ++ docker/mariadb/Dockerfile.j2 | 2 ++ docker/memcached/Dockerfile.j2 | 2 ++ docker/mistral/mistral-api/Dockerfile.j2 | 3 +++ docker/mistral/mistral-base/Dockerfile.j2 | 2 ++ docker/mistral/mistral-engine/Dockerfile.j2 | 2 ++ docker/mistral/mistral-executor/Dockerfile.j2 | 2 ++ docker/mongodb/Dockerfile.j2 | 2 ++ docker/multipathd/Dockerfile.j2 | 2 ++ docker/murano/murano-api/Dockerfile.j2 | 3 +++ docker/murano/murano-base/Dockerfile.j2 | 2 ++ docker/murano/murano-engine/Dockerfile.j2 | 2 ++ docker/neutron/neutron-base/Dockerfile.j2 | 2 ++ docker/neutron/neutron-dhcp-agent/Dockerfile.j2 | 2 ++ docker/neutron/neutron-l3-agent/Dockerfile.j2 | 2 ++ docker/neutron/neutron-lbaas-agent/Dockerfile.j2 | 3 +++ .../neutron-linuxbridge-agent/Dockerfile.j2 | 2 ++ .../neutron/neutron-metadata-agent/Dockerfile.j2 | 2 ++ .../neutron/neutron-metering-agent/Dockerfile.j2 | 3 +++ .../neutron-networking-sfc-agent/Dockerfile.j2 | 2 ++ .../neutron-openvswitch-agent/Dockerfile.j2 | 2 ++ docker/neutron/neutron-server/Dockerfile.j2 | 2 ++ docker/nova/nova-api/Dockerfile.j2 | 2 ++ docker/nova/nova-base/Dockerfile.j2 | 2 ++ docker/nova/nova-compute-ironic/Dockerfile.j2 | 2 ++ docker/nova/nova-compute/Dockerfile.j2 | 2 ++ docker/nova/nova-conductor/Dockerfile.j2 | 2 ++ docker/nova/nova-consoleauth/Dockerfile.j2 | 2 ++ docker/nova/nova-libvirt/Dockerfile.j2 | 2 ++ docker/nova/nova-network/Dockerfile.j2 | 2 ++ docker/nova/nova-novncproxy/Dockerfile.j2 | 2 ++ docker/nova/nova-scheduler/Dockerfile.j2 | 2 ++ docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 2 ++ docker/nova/nova-ssh/Dockerfile.j2 | 2 ++ docker/openstack-base/Dockerfile.j2 | 2 ++ docker/openvswitch/openvswitch-base/Dockerfile.j2 | 3 +++ .../openvswitch-db-server/Dockerfile.j2 | 2 ++ .../openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 ++ docker/rabbitmq/Dockerfile.j2 | 2 ++ docker/rally/Dockerfile.j2 | 2 ++ docker/sahara/sahara-api/Dockerfile.j2 | 3 +++ docker/sahara/sahara-base/Dockerfile.j2 | 2 ++ docker/sahara/sahara-engine/Dockerfile.j2 | 2 ++ docker/senlin/senlin-api/Dockerfile.j2 | 2 ++ docker/senlin/senlin-base/Dockerfile.j2 | 2 ++ docker/senlin/senlin-engine/Dockerfile.j2 | 2 ++ docker/swift/swift-account/Dockerfile.j2 | 2 ++ docker/swift/swift-base/Dockerfile.j2 | 2 ++ docker/swift/swift-container/Dockerfile.j2 | 2 ++ docker/swift/swift-object/Dockerfile.j2 | 2 ++ docker/swift/swift-proxy-server/Dockerfile.j2 | 2 ++ docker/swift/swift-rsyncd/Dockerfile.j2 | 2 ++ docker/telegraf/Dockerfile.j2 | 3 +++ docker/tempest/Dockerfile.j2 | 2 ++ docker/tgtd/Dockerfile.j2 | 2 ++ docker/trove/trove-api/Dockerfile.j2 | 3 +++ docker/trove/trove-base/Dockerfile.j2 | 2 ++ docker/trove/trove-conductor/Dockerfile.j2 | 2 ++ docker/trove/trove-guestagent/Dockerfile.j2 | 2 ++ docker/trove/trove-taskmanager/Dockerfile.j2 | 2 ++ docker/vmtp/Dockerfile.j2 | 2 ++ docker/watcher/watcher-api/Dockerfile.j2 | 2 ++ docker/watcher/watcher-applier/Dockerfile.j2 | 2 ++ docker/watcher/watcher-base/Dockerfile.j2 | 2 ++ docker/watcher/watcher-engine/Dockerfile.j2 | 2 ++ docker/zaqar/Dockerfile.j2 | 2 ++ .../notes/add-header-blocks-9ac76254e5f5ab20.yaml | 3 +++ 149 files changed, 335 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/add-header-blocks-9ac76254e5f5ab20.yaml diff --git a/docker/aodh/aodh-api/Dockerfile.j2 b/docker/aodh/aodh-api/Dockerfile.j2 index 275be3aff2..23288c9b03 100644 --- a/docker/aodh/aodh-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/aodh/aodh-base/Dockerfile.j2 b/docker/aodh/aodh-base/Dockerfile.j2 index 68d2c4a200..ad9cd43759 100644 --- a/docker/aodh/aodh-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/aodh/aodh-evaluator/Dockerfile.j2 b/docker/aodh/aodh-evaluator/Dockerfile.j2 index f6b258f73e..342d4b1c9f 100644 --- a/docker/aodh/aodh-evaluator/Dockerfile.j2 +++ b/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' %} diff --git a/docker/aodh/aodh-expirer/Dockerfile.j2 b/docker/aodh/aodh-expirer/Dockerfile.j2 index e893dd06b3..235c7d3697 100644 --- a/docker/aodh/aodh-expirer/Dockerfile.j2 +++ b/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' %} diff --git a/docker/aodh/aodh-listener/Dockerfile.j2 b/docker/aodh/aodh-listener/Dockerfile.j2 index 2d2afcf9bd..894d44f678 100644 --- a/docker/aodh/aodh-listener/Dockerfile.j2 +++ b/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' %} diff --git a/docker/aodh/aodh-notifier/Dockerfile.j2 b/docker/aodh/aodh-notifier/Dockerfile.j2 index 8775a3a1a6..c83de2af56 100644 --- a/docker/aodh/aodh-notifier/Dockerfile.j2 +++ b/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' %} diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index a15cbf52e6..df83638e9d 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 4843ffee0f..3eb5b88456 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2 index d25d144f31..c35c1696a5 100644 --- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 +++ b/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' %} diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2 index 1d648ce254..65208e0cc1 100644 --- a/docker/barbican/barbican-worker/Dockerfile.j2 +++ b/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' %} diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 661688017f..ac251b57a9 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/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 diff --git a/docker/bifrost/bifrost-deploy/Dockerfile.j2 b/docker/bifrost/bifrost-deploy/Dockerfile.j2 index 2f4149ea79..aee377e2b4 100644 --- a/docker/bifrost/bifrost-deploy/Dockerfile.j2 +++ b/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 %} diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 6e65a658e2..422ecefc13 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 8c7f8d15ac..bc39a8fcf6 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 46bcc5540c..1d54a9f3b2 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 164ed1e76c..40c02155de 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index d1b63ac211..bdb119be80 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index edf6ac2dda..d2cdf5fe6a 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index aec79be74e..19c9c6f809 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index f0c084f6b4..0627eff006 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/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 diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 41c0b6d204..3f38fd016d 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/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 diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index ccdbdebf79..721bd8f05b 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/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 }} diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 629de733fc..13756c9979 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 3c616f7931..773fc72fc5 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index ac9922d03b..b5b321cc4d 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cinder/cinder-rpcbind/Dockerfile.j2 b/docker/cinder/cinder-rpcbind/Dockerfile.j2 index 3a9c1b53ae..6516b55ae5 100644 --- a/docker/cinder/cinder-rpcbind/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 9233d09ca0..b19cb83594 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 329ef49b49..fd4f1c6bb3 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 index cdbff832d4..897808b1da 100644 --- a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 index 839d29b5af..ff01520d2d 100644 --- a/docker/cloudkitty/cloudkitty-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 index 0b0c0d250c..9d78b260f6 100644 --- a/docker/cloudkitty/cloudkitty-processor/Dockerfile.j2 +++ b/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' %} diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index c04b367b97..31722f69ed 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/congress/congress-api/Dockerfile.j2 b/docker/congress/congress-api/Dockerfile.j2 index b23548746e..4a47d6b944 100644 --- a/docker/congress/congress-api/Dockerfile.j2 +++ b/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 diff --git a/docker/congress/congress-base/Dockerfile.j2 b/docker/congress/congress-base/Dockerfile.j2 index a7a19f82cc..7a399fe0b2 100644 --- a/docker/congress/congress-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/congress/congress-datasource/Dockerfile.j2 b/docker/congress/congress-datasource/Dockerfile.j2 index 5a62891ec0..f807ddb695 100644 --- a/docker/congress/congress-datasource/Dockerfile.j2 +++ b/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 }} diff --git a/docker/congress/congress-policy-engine/Dockerfile.j2 b/docker/congress/congress-policy-engine/Dockerfile.j2 index 6a1a6d056b..88de855717 100644 --- a/docker/congress/congress-policy-engine/Dockerfile.j2 +++ b/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 }} diff --git a/docker/cron/Dockerfile.j2 b/docker/cron/Dockerfile.j2 index 6921ee1b64..d90f53933f 100644 --- a/docker/cron/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 9a69e9b28c..9b6a5bf3aa 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 975d82c372..b912ffacd3 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 2ae661d051..fdadee6df9 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 858fbe7231..f2caebad12 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 660184b7fe..a1729826f5 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2 index 37776f4771..815ceb5e8b 100644 --- a/docker/designate/designate-pool-manager/Dockerfile.j2 +++ b/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' %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 9d0ff85fa0..3c98d64ed7 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/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' %} diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index f41409e2b3..628d62b73a 100644 --- a/docker/dind/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index 73b320889c..1b3a2badf7 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index d03df41313..dae3ec3987 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index c9de79c7ab..51693533d8 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/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 diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index e645ae53de..549599defb 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index d57831637b..2f214f8533 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/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 }} diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 64517108bb..a1070de05d 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index eeb566ddd4..c740e376ff 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/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 %} diff --git a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 b/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 index 7e791dca27..e0bec4166b 100644 --- a/docker/gnocchi/gnocchi-metricd/Dockerfile.j2 +++ b/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' %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 1b46b789ab..9b38273791 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/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' %} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index c6561a0646..db21b55fd2 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 501622cb69..4183ed7811 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/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' %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 5adf39578b..836f425394 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index e337a0afc5..9bd7f9d4f3 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 8f9ed23f7e..3afe0b108c 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/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' %} diff --git a/docker/heka/Dockerfile.j2 b/docker/heka/Dockerfile.j2 index eba6583839..5428ff5089 100644 --- a/docker/heka/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 5076804e68..5a589615f0 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/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' %} diff --git a/docker/influxdb/Dockerfile.j2 b/docker/influxdb/Dockerfile.j2 index fc1d9fe2c0..fdd1cf614e 100644 --- a/docker/influxdb/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 7325051a51..3f9d133596 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index ca45f13a16..027c49f7d7 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 4448260995..c919027b27 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index d3ea30786d..b4ad685fa9 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/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' %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 6a4b13b9d8..cac474faa4 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 7f4425964e..4d57038b0c 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index ea1d1b47d2..673edfd574 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 3364377320..6f5a40fdd7 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/keystone/keystone-fernet/Dockerfile.j2 b/docker/keystone/keystone-fernet/Dockerfile.j2 index 0488ceb91b..bda73bcf38 100644 --- a/docker/keystone/keystone-fernet/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 2f53897420..cf3e90851e 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index e6baa93492..4efca8744c 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/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 diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 3f4d8ab828..9ea010a73f 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/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 \ diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 25b8bcce81..b05d1a5123 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/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 %} diff --git a/docker/kuryr/Dockerfile.j2 b/docker/kuryr/Dockerfile.j2 index d43edf265f..21c07e3709 100644 --- a/docker/kuryr/Dockerfile.j2 +++ b/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 }}' \ diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index e230b72e9b..e1f2285e62 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index 7fd1211dc1..f9b7abc33c 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 3284ab461d..b4d3f5fd3a 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/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' %} diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2 index 9338861c0b..70908d82c1 100644 --- a/docker/manila/manila-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index 1ba4007e36..cf2d34a59c 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2 index 4eba220198..56ee3ad3f7 100644 --- a/docker/manila/manila-scheduler/Dockerfile.j2 +++ b/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' %} diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2 index 81f12907c6..d1eaff2797 100644 --- a/docker/manila/manila-share/Dockerfile.j2 +++ b/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' %} diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 50b0a05134..5379858308 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 5ebab7fc50..7b921803f1 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index 80f0c78713..6d9cb55751 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2 index 5c7c90ed7e..e3c5c3e6ef 100644 --- a/docker/mistral/mistral-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2 index ed55401ebc..295bc265d0 100644 --- a/docker/mistral/mistral-engine/Dockerfile.j2 +++ b/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' %} diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index e52af60932..b594bbaf45 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/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' %} diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index 727667bee2..1edece5d94 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index 66a6754809..70e499d2ff 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 76dc174f49..d1f09480f8 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/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' %} diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 295f327a4e..ef2d7bd01b 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 825831e49e..d00e6998ac 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/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' %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 5e9b6218e5..58c946f2bb 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/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' %} diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index 0f0ab4c7cb..497f220025 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 index cf069f4ab7..235ced6a3a 100644 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ b/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' %} diff --git a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 b/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 index dfda7ddd9e..9b21622a80 100644 --- a/docker/neutron/neutron-lbaas-agent/Dockerfile.j2 +++ b/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 = [ diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index c9323b536c..6fcbade2f7 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/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' %} diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 748011c3f5..7aeaea12ca 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/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'] %} diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 index bed3fefe4b..abc875e91a 100644 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metering-agent/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block neutron_metering_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 b/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 index e5d2d348cc..1582ea9a7c 100644 --- a/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-networking-sfc-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_networking_sfc_agent_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index a89534846c..d5ce88eee3 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_openvswitch_agent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 07d31e83e0..40016be5e9 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block neutron_server_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 1997b4c611..869a9801dd 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index b093a94e73..3382975ee1 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index ace1259bdd..03176db833 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_compute_ironic_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 3c5b5cc21a..ed832f4419 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_compute_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index 4bb5658aae..c666359d1c 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_conductor_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index 9b2205c8e4..68173e23be 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_consoleauth_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 9bc485fc9d..4e5e1a9fbd 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_libvirt_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 index 5baa132a08..33cd477a37 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_network_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 78e78f2f66..c5ed90a843 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_novncproxy_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 97d205f2f6..4b21646255 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_scheduler_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index a6f76c2ec7..994915cff2 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_spicehtml5proxy_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 08041a5735..2ec3b5a5b7 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block nova_ssh_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% set nova_ssh_packages = [ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3ec33f1beb..ae02b657d7 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% block openstack_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index b41cc26344..5dbe14c1c7 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block openvswitch_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 1cc28e1684..cf85de2bda 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block openvswitch_db_server_header %}{% endblock %} + COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 5e6880ce58..ef7a5e6ed8 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block openvswitch_vswitchd_header %}{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index d11041fb9c..8e25ec65a0 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% block rabbitmq_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 503fcad7f3..7674f6e8b6 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block rally_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/sahara/sahara-api/Dockerfile.j2 b/docker/sahara/sahara-api/Dockerfile.j2 index dcd03f5866..4b4a191d54 100644 --- a/docker/sahara/sahara-api/Dockerfile.j2 +++ b/docker/sahara/sahara-api/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block sahara_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index 755421b8da..14c642c607 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block sahara_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index aa5803890c..50ee5fbea6 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}sahara-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block sahara_engine_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index 6be9fd8f06..e556b40861 100644 --- a/docker/senlin/senlin-api/Dockerfile.j2 +++ b/docker/senlin/senlin-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_api_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2 index 9c6c783b9e..369b0bf4ec 100644 --- a/docker/senlin/senlin-base/Dockerfile.j2 +++ b/docker/senlin/senlin-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_base_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2 index 42d5f3cd03..625796d072 100644 --- a/docker/senlin/senlin-engine/Dockerfile.j2 +++ b/docker/senlin/senlin-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}senlin-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block senlin_engine_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/swift/swift-account/Dockerfile.j2 b/docker/swift/swift-account/Dockerfile.j2 index dacde88b09..6404759770 100644 --- a/docker/swift/swift-account/Dockerfile.j2 +++ b/docker/swift/swift-account/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_account_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 5fe04a0a25..a4fdb533df 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container/Dockerfile.j2 b/docker/swift/swift-container/Dockerfile.j2 index c59cac0e9c..c03c2e6fdc 100644 --- a/docker/swift/swift-container/Dockerfile.j2 +++ b/docker/swift/swift-container/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_container_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-object/Dockerfile.j2 b/docker/swift/swift-object/Dockerfile.j2 index d575af0472..4edb02d4e7 100644 --- a/docker/swift/swift-object/Dockerfile.j2 +++ b/docker/swift/swift-object/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_object_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 54895ff651..ae01f71c61 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_proxy_server_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index b85a7a4927..7f781700cf 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block swift_rsyncd_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index 81906ced7b..dcd08e8b72 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block telegraf_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% set telegraf_packages = ['telegraf'] %} diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index 08c6c2471b..801edaa2b7 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block tempest_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/tgtd/Dockerfile.j2 b/docker/tgtd/Dockerfile.j2 index 7115732d78..b0ca4003ba 100644 --- a/docker/tgtd/Dockerfile.j2 +++ b/docker/tgtd/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} +{% block tgtd_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index 1a022b7f46..d4e09e0a6f 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block trove_api_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 86521191fb..e09bda1d2d 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block trove_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 464a350238..cc7adfe580 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block trove_conductor_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 56823fb8ef..174cf22ac7 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block trove_guestagent_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 9930f3df2d..3ac251b318 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}trove-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block trove_taskmanager_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 index b286ac03e5..3bc1cc53e5 100644 --- a/docker/vmtp/Dockerfile.j2 +++ b/docker/vmtp/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block vmtp_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 index d428f69d4d..03fc31c285 100644 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ b/docker/watcher/watcher-api/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_api_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2 index a3469103c0..9a5ffa5737 100644 --- a/docker/watcher/watcher-applier/Dockerfile.j2 +++ b/docker/watcher/watcher-applier/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_applier_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2 index 5e475f5629..1e695dc0bb 100644 --- a/docker/watcher/watcher-base/Dockerfile.j2 +++ b/docker/watcher/watcher-base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_base_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2 index bae251c92e..3b924d0c70 100644 --- a/docker/watcher/watcher-engine/Dockerfile.j2 +++ b/docker/watcher/watcher-engine/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block watcher_engine_header %}{% endblock %} + {% if install_type == 'binary' %} RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index e60efdfa8b..77cb95fb9b 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block zaqar_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} diff --git a/releasenotes/notes/add-header-blocks-9ac76254e5f5ab20.yaml b/releasenotes/notes/add-header-blocks-9ac76254e5f5ab20.yaml new file mode 100644 index 0000000000..b5b57927d3 --- /dev/null +++ b/releasenotes/notes/add-header-blocks-9ac76254e5f5ab20.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add jinja2 header blocks to each Dockerfile.