From 0e99b69de48c1deb7f6f1f707e78f445caa5c3d0 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 17 Sep 2015 09:35:33 -0700 Subject: [PATCH] Implement a install_type and install_metatype This prepares for the RHEL OSP implementation by making the build tool convert all binary-* into an install_type of binary and * into an install_metatype variable substitution inside the Dockerfiles. Further binary-* is substituted as install_name to enable proper building only. Change-Id: Ib681b29176eb79a3cab12ec824313fdecb6e7a5f Partially-Implements: blueprint rhel-based-image-support --- docker/base/Dockerfile.j2 | 1 + .../ceilometer/ceilometer-alarm/Dockerfile.j2 | 2 +- .../ceilometer/ceilometer-api/Dockerfile.j2 | 2 +- .../ceilometer/ceilometer-base/Dockerfile.j2 | 2 +- .../ceilometer-central/Dockerfile.j2 | 2 +- .../ceilometer-collector/Dockerfile.j2 | 2 +- .../ceilometer-compute/Dockerfile.j2 | 2 +- .../ceilometer-notification/Dockerfile.j2 | 2 +- docker/ceph/ceph-base/Dockerfile.j2 | 2 +- docker/ceph/ceph-mon/Dockerfile.j2 | 2 +- docker/ceph/ceph-osd/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-scheduler/Dockerfile.j2 | 2 +- docker/cinder/cinder-volume/Dockerfile.j2 | 2 +- docker/designate/designate-api/Dockerfile.j2 | 2 +- .../designate-backend-bind9/Dockerfile.j2 | 2 +- docker/designate/designate-base/Dockerfile.j2 | 2 +- .../designate/designate-central/Dockerfile.j2 | 2 +- docker/designate/designate-mdns/Dockerfile.j2 | 2 +- .../designate-poolmanager/Dockerfile.j2 | 2 +- docker/designate/designate-sink/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 | 2 +- docker/gnocchi/gnocchi-base/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 | 2 +- docker/heat/heat-base/Dockerfile.j2 | 2 +- docker/heat/heat-engine/Dockerfile.j2 | 2 +- docker/horizon/Dockerfile.j2 | 2 +- docker/ironic/ironic-api/Dockerfile.j2 | 2 +- docker/ironic/ironic-base/Dockerfile.j2 | 2 +- docker/ironic/ironic-conductor/Dockerfile.j2 | 2 +- docker/ironic/ironic-discoverd/Dockerfile.j2 | 2 +- docker/keepalived/Dockerfile.j2 | 2 +- docker/keystone/Dockerfile.j2 | 2 +- docker/kolla-ansible/Dockerfile.j2 | 2 +- docker/logging/rsyslog/Dockerfile.j2 | 2 +- docker/magnum/magnum-api/Dockerfile.j2 | 2 +- docker/magnum/magnum-base/Dockerfile.j2 | 2 +- docker/magnum/magnum-conductor/Dockerfile.j2 | 2 +- docker/mariadb/Dockerfile.j2 | 2 +- docker/memcached/Dockerfile.j2 | 2 +- docker/mongodb/Dockerfile.j2 | 2 +- docker/murano/murano-api/Dockerfile.j2 | 2 +- docker/murano/murano-base/Dockerfile.j2 | 2 +- docker/murano/murano-engine/Dockerfile.j2 | 2 +- docker/neutron/neutron-agents/Dockerfile.j2 | 2 +- docker/neutron/neutron-base/Dockerfile.j2 | 2 +- .../neutron-linuxbridge-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/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/openstack-base/Dockerfile.j2 | 2 +- docker/openvswitch/ovs-base/Dockerfile.j2 | 2 +- .../openvswitch/ovs-db-server/Dockerfile.j2 | 2 +- docker/openvswitch/ovs-vswitchd/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- .../swift/swift-account-auditor/Dockerfile.j2 | 2 +- .../swift/swift-account-reaper/Dockerfile.j2 | 2 +- .../swift-account-replicator/Dockerfile.j2 | 2 +- .../swift/swift-account-server/Dockerfile.j2 | 2 +- docker/swift/swift-base/Dockerfile.j2 | 2 +- .../swift-container-auditor/Dockerfile.j2 | 2 +- .../swift-container-replicator/Dockerfile.j2 | 2 +- .../swift-container-server/Dockerfile.j2 | 2 +- .../swift-container-updater/Dockerfile.j2 | 2 +- .../swift/swift-object-auditor/Dockerfile.j2 | 2 +- docker/swift/swift-object-base/Dockerfile.j2 | 2 +- .../swift/swift-object-expirer/Dockerfile.j2 | 2 +- .../swift-object-replicator/Dockerfile.j2 | 2 +- .../swift/swift-object-server/Dockerfile.j2 | 2 +- .../swift/swift-object-updater/Dockerfile.j2 | 2 +- docker/swift/swift-proxy-server/Dockerfile.j2 | 2 +- docker/swift/swift-rsyncd/Dockerfile.j2 | 2 +- docker/zaqar/Dockerfile.j2 | 2 +- kolla/cmd/build.py | 29 ++++++++++++++----- 90 files changed, 110 insertions(+), 96 deletions(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3623872475..7c7263d6d4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -28,6 +28,7 @@ RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_dis ENV KOLLA_BASE_DISTRO {{ base_distro }} ENV KOLLA_INSTALL_TYPE {{ install_type }} +ENV KOLLA_INSTALL_METATYPE {{ install_metatype }} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 index b7fcc7fc26..f720ee15d4 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 9316ac5c5f..7470a9026d 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 43c399a8d9..315a218f5b 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'source' %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 0d7ee7147a..3b2e9a2c07 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index ec6ccbce9e..c5cf80d452 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 60b18b9735..dd6bc62af1 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index bc6b30ffef..5711664431 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 363346bce7..95e5bca752 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% 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 3f3d32a750..57d31e8198 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 5e1eacc401..ac453ce881 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceph-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 8e3185bf4e..4c481a45f4 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/cinder/cinder-backup/Dockerfile.j2 b/docker/cinder/cinder-backup/Dockerfile.j2 index 7077d7250a..14794b0531 100644 --- a/docker/cinder/cinder-backup/Dockerfile.j2 +++ b/docker/cinder/cinder-backup/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh / diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 1e2553f798..767f7bd5bb 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/cinder/cinder-scheduler/Dockerfile.j2 b/docker/cinder/cinder-scheduler/Dockerfile.j2 index 7077d7250a..14794b0531 100644 --- a/docker/cinder/cinder-scheduler/Dockerfile.j2 +++ b/docker/cinder/cinder-scheduler/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY ./start.sh / diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 4186289dcc..4eda4b9819 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 1e2e28e8f0..f0b8ea6cff 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 3b47ff72e7..f163c7b987 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index b12fa013be..09ddb4e758 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 3c43099991..01ddbbfd0b 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 49d7fa7813..fdb2d0c1d5 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 35f99c2bf1..1d8df60ade 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 1d52a282b4..bc4fa45c90 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 2401a870a5..c0bdc14e86 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index cc628b8835..bf079c5280 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/glance/glance-registry/Dockerfile.j2 b/docker/glance/glance-registry/Dockerfile.j2 index 2401a870a5..c0bdc14e86 100644 --- a/docker/glance/glance-registry/Dockerfile.j2 +++ b/docker/glance/glance-registry/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-glance-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 495e32f96d..b9479c1d74 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-gnocchi-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 343f239bfe..745e8355aa 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 9f40829815..b9fd0a52ed 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-gnocchi-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}gnocchi-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index a98738bfda..fe02ce804e 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 7e8701eda7..7b4cb7d68c 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 48bbda15d9..19eb897775 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 0bbf3a53c6..00ca07f3b8 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 495d2b3754..3759788d1b 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 790bef89da..427dd59650 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index e628c9ffce..112ff8b2df 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index cf6b53b7d3..2f8207c0ea 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 992a2cb8b2..f62f7b7a0f 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2 index 799d70e78a..1843cb24cf 100644 --- a/docker/ironic/ironic-discoverd/Dockerfile.j2 +++ b/docker/ironic/ironic-discoverd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 0397313479..9fbc7c49ac 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 067f16b899..115f537a26 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index 40020107d3..1e8c10c77e 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index 4ea34df4d2..521968f13c 100755 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index cb49ec7fa6..81d44e69f4 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-magnum-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index dc16cb4478..de0dab422c 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 02b1f42aa2..bfd9ca32de 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-magnum-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index c966dcb2d2..1cfae7798c 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 9d2b998782..88baa50105 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index 13bc6ed026..f7662ae495 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/docker/mongodb/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% 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 6d69206e40..e6b68b1c76 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index a05eb6fb83..8fab1a4d4f 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'source' %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 6d69206e40..e6b68b1c76 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 58d2b6d059..7eb1a1152c 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 826a0788e6..8560d72d5e 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 20f502f185..360afc4d18 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 6911afb94b..b6e797b0c5 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 1b3f496504..12a9b2df70 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 82bec4fea2..e0d7a0db03 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 8032090aab..1572e78029 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 26890dd662..428219cecd 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index b3248c8f5e..8b75626cd7 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index cdc7c1fa77..b6b0e3da85 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index f296eb55c0..28be924709 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% 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 977f12a1d4..2ebba6830f 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 5f125ecf59..3a1e69bc8c 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 6d2584cf22..887b0bf6b6 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 4fce55e36a..893014088a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'source' %} diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 index 05e5b18922..7ededdfcd6 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/ovs-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2 index bec5a8f12e..cca030e35e 100644 --- a/docker/openvswitch/ovs-db-server/Dockerfile.j2 +++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 index 14b3d08a92..839da1f213 100644 --- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 010c143c81..1d6db3e13f 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/swift/swift-account-auditor/Dockerfile.j2 b/docker/swift/swift-account-auditor/Dockerfile.j2 index 5570b0d220..a8ffc48aef 100644 --- a/docker/swift/swift-account-auditor/Dockerfile.j2 +++ b/docker/swift/swift-account-auditor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-account-reaper/Dockerfile.j2 b/docker/swift/swift-account-reaper/Dockerfile.j2 index 5570b0d220..a8ffc48aef 100644 --- a/docker/swift/swift-account-reaper/Dockerfile.j2 +++ b/docker/swift/swift-account-reaper/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-account-replicator/Dockerfile.j2 b/docker/swift/swift-account-replicator/Dockerfile.j2 index 5570b0d220..a8ffc48aef 100644 --- a/docker/swift/swift-account-replicator/Dockerfile.j2 +++ b/docker/swift/swift-account-replicator/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 index 7273c60a18..dc4c56bfc1 100644 --- a/docker/swift/swift-account-server/Dockerfile.j2 +++ b/docker/swift/swift-account-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index df1ed30c90..8a9747d2a5 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container-auditor/Dockerfile.j2 b/docker/swift/swift-container-auditor/Dockerfile.j2 index ae798eebb0..7e7b6632be 100644 --- a/docker/swift/swift-container-auditor/Dockerfile.j2 +++ b/docker/swift/swift-container-auditor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container-replicator/Dockerfile.j2 b/docker/swift/swift-container-replicator/Dockerfile.j2 index ae798eebb0..7e7b6632be 100644 --- a/docker/swift/swift-container-replicator/Dockerfile.j2 +++ b/docker/swift/swift-container-replicator/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2 index 2c7050876e..47ca202f38 100644 --- a/docker/swift/swift-container-server/Dockerfile.j2 +++ b/docker/swift/swift-container-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-container-updater/Dockerfile.j2 b/docker/swift/swift-container-updater/Dockerfile.j2 index ae798eebb0..7e7b6632be 100644 --- a/docker/swift/swift-container-updater/Dockerfile.j2 +++ b/docker/swift/swift-container-updater/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-object-auditor/Dockerfile.j2 b/docker/swift/swift-object-auditor/Dockerfile.j2 index 1bb481f7a6..247b5e0788 100644 --- a/docker/swift/swift-object-auditor/Dockerfile.j2 +++ b/docker/swift/swift-object-auditor/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / diff --git a/docker/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2 index cd56891776..5479ac2e86 100644 --- a/docker/swift/swift-object-base/Dockerfile.j2 +++ b/docker/swift/swift-object-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index 4224014507..7682df365e 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2 index 1bb481f7a6..247b5e0788 100644 --- a/docker/swift/swift-object-replicator/Dockerfile.j2 +++ b/docker/swift/swift-object-replicator/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / diff --git a/docker/swift/swift-object-server/Dockerfile.j2 b/docker/swift/swift-object-server/Dockerfile.j2 index 1bb481f7a6..247b5e0788 100644 --- a/docker/swift/swift-object-server/Dockerfile.j2 +++ b/docker/swift/swift-object-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / diff --git a/docker/swift/swift-object-updater/Dockerfile.j2 b/docker/swift/swift-object-updater/Dockerfile.j2 index 1bb481f7a6..247b5e0788 100644 --- a/docker/swift/swift-object-updater/Dockerfile.j2 +++ b/docker/swift/swift-object-updater/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) COPY start.sh / diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 806cb95915..864d8dc5d2 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/swift/swift-rsyncd/Dockerfile.j2 b/docker/swift/swift-rsyncd/Dockerfile.j2 index 5fda933a33..7fd6b35932 100644 --- a/docker/swift/swift-rsyncd/Dockerfile.j2 +++ b/docker/swift/swift-rsyncd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index 2fe7766068..e406a8c8c4 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index d0972d491c..ed4a34992a 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -220,7 +220,7 @@ def merge_args_and_config(settings_from_config_file): "tag": "latest", "base": "centos", "base_tag": "latest", - "type": "binary", + "install_type": "binary", "no_cache": False, "keep": False, "push": False, @@ -248,7 +248,8 @@ def merge_args_and_config(settings_from_config_file): type=str) parser.add_argument('-t', '--type', help='The method of the Openstack install', - type=str) + type=str, + dest='install_type') parser.add_argument('--no-cache', help='Do not use the Docker cache when building', action='store_true') @@ -293,15 +294,25 @@ class KollaWorker(object): self.namespace = config['namespace'] self.base = config['base'] self.base_tag = config['base_tag'] - self.type_ = config['type'] + self.install_type = config['install_type'] + self.tag = config['tag'] + self.image_prefix = self.base + '-' + config['install_type'] + '-' + + if '-' in config['install_type']: + self.install_type, self.install_metatype = \ + self.install_type.split('-', 2) + else: + if self.install_type == 'binary': + self.install_metatype = 'rdo' + elif self.install_type == 'source': + self.install_metatype = 'mixed' + self.tag = config['tag'] - self.prefix = self.base + '-' + self.type_ + '-' self.include_header = config['include_header'] self.include_footer = config['include_footer'] self.regex = config['regex'] self.source_location = ConfigParser.SafeConfigParser() self.source_location.read(find_config_file('kolla-build.conf')) - self.image_statuses_bad = dict() self.image_statuses_good = dict() self.image_statuses_unmatched = dict() @@ -330,7 +341,9 @@ class KollaWorker(object): template = env.get_template(template_name) values = {'base_distro': self.base, 'base_distro_tag': self.base_tag, - 'install_type': self.type_, + 'install_metatype': self.install_metatype, + 'image_prefix': self.image_prefix, + 'install_type': self.install_type, 'namespace': self.namespace, 'tag': self.tag} if self.include_header: @@ -441,7 +454,7 @@ class KollaWorker(object): image = dict() image['status'] = "unprocessed" image['name'] = os.path.basename(path) - image['fullname'] = self.namespace + '/' + self.prefix + \ + image['fullname'] = self.namespace + '/' + self.image_prefix + \ image['name'] + ':' + self.tag image['path'] = path image['parent_name'] = content.split(' ')[1].split('\n')[0] @@ -449,7 +462,7 @@ class KollaWorker(object): image['parent'] = None image['children'] = list() - if self.type_ == 'source': + if self.install_type == 'source': image['source'] = dict() try: image['source']['type'] = \