openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove hardcoded MAINTAINER in Dockerfiles"

Browse Source
This commit is contained in:
Jenkins 2015-11-23 14:12:33 +00:00 committed by Gerrit Code Review
commit 7f2d46278f
96 changed files with 102 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ base_distro }}:{{ base_distro_tag }} FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
# Early failure for bases and types # Early failure for bases and types
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-alarm/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'source' %} {% if install_type == 'source' %}

2
docker/ceilometer/ceilometer-central/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-collector/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceilometer/ceilometer-notification/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ceph/ceph-mon/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY fetch_ceph_keys.py /usr/bin/ COPY fetch_ceph_keys.py /usr/bin/

2
docker/ceph/ceph-osd/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/cinder/cinder-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/cinder/cinder-backup/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/cinder/cinder-scheduler/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/data/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ base_distro }}:{{ base_distro_tag }} FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
CMD /bin/sleep infinity CMD /bin/sleep infinity

2
docker/designate/designate-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-backend-bind9/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-central/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-mdns/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-poolmanager/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/designate/designate-sink/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/dind/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/glance/glance-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/glance/glance-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/glance/glance-registry/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}

2
docker/gnocchi/gnocchi-statsd/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/haproxy/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/heat/heat-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/heat/heat-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/heat/heat-engine/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/horizon/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ironic/ironic-discoverd/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/keepalived/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/keystone/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}

2
docker/kolla-ansible/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/logging/rsyslog/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/magnum/magnum-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos'] %} {% if base_distro in ['centos'] %}

2
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/mariadb/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/memcached/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/mongodb/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/murano/murano-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/murano/murano-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'source' %} {% if install_type == 'source' %}

2
docker/murano/murano-engine/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/neutron/neutron-agents/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/nova/nova-api/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-compute/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-consoleauth/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-network/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-novncproxy/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-scheduler/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/openstack-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ RUN yum -y install \

2
docker/openvswitch/openvswitch-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/openvswitch/openvswitch-db-server/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start

2
docker/rabbitmq/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-account-auditor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-account-reaper/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-account-replicator/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-account-server/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-container-auditor/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-container-replicator/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-container-server/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-container-updater/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}

2
docker/swift/swift-object-auditor/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/swift/swift-object-base/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-object-expirer/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-object-replicator/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/swift/swift-object-server/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/swift/swift-object-updater/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{{ include_footer }} {{ include_footer }}

2
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

2
docker/swift/swift-rsyncd/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}

2
docker/zaqar/Dockerfile.j2
View File

@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

3
etc/kolla/kolla-build.conf
View File

@ -2,6 +2,9 @@
[kolla-build] [kolla-build]
#The MAINTAINER field
#maintainer = Kolla Project (https://launchpad.net/kolla)
# The Docker namespace name # The Docker namespace name
#namespace = kollaglue #namespace = kollaglue

7
kolla/cmd/build.py
View File

@ -242,7 +242,8 @@ def merge_args_and_config(settings_from_config_file):
"push": False, "push": False,
"threads": 8, "threads": 8,
"retries": 3, "retries": 3,
"registry": None "registry": None,
"maintainer": "Kolla Project (https://launchpad.net/kolla)"
} }
defaults.update(settings_from_config_file.items('kolla-build')) defaults.update(settings_from_config_file.items('kolla-build'))
parser.set_defaults(**defaults) parser.set_defaults(**defaults)
@ -361,6 +362,7 @@ class KollaWorker(object):
self.image_statuses_bad = dict() self.image_statuses_bad = dict()
self.image_statuses_good = dict() self.image_statuses_good = dict()
self.image_statuses_unmatched = dict() self.image_statuses_unmatched = dict()
self.maintainer = config['maintainer']
def setup_working_dir(self): def setup_working_dir(self):
"""Creates a working directory for use while building""" """Creates a working directory for use while building"""
@ -390,7 +392,8 @@ class KollaWorker(object):
'image_prefix': self.image_prefix, 'image_prefix': self.image_prefix,
'install_type': self.install_type, 'install_type': self.install_type,
'namespace': self.namespace, 'namespace': self.namespace,
'tag': self.tag} 'tag': self.tag,
'maintainer': self.maintainer}
if self.include_header: if self.include_header:
with open(self.include_header, 'r') as f: with open(self.include_header, 'r') as f:
values['include_header'] = f.read() values['include_header'] = f.read()

2
tools/validate-maintainer.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
MAINTAINER='MAINTAINER Kolla Project (https://launchpad.net/kolla)' MAINTAINER='MAINTAINER {{ maintainer }}'
RES=0 RES=0
for dockerfile in "$@"; do for dockerfile in "$@"; do