openstack/kolla-ansible
Code Issues Proposed changes

Implement a install_type and install_metatype

Browse Source 
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
This commit is contained in:
Steven Dake 2015-09-17 09:35:33 -07:00
parent d813f53b95
commit 0e99b69de4
90 changed files with 110 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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'] %}

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

@ -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 /

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

@ -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 /

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

@ -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' %}

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

@ -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 /

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

@ -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' %}

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

@ -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 /

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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 /

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

@ -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' %}

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

@ -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 /

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

2
docker/haproxy/Dockerfile.j2
View File

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

2
docker/horizon/Dockerfile.j2
View File

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

2
docker/keepalived/Dockerfile.j2
View File

@ -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'] %}

2
docker/keystone/Dockerfile.j2
View File

@ -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' %}

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

@ -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'] %}

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

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

2
docker/mariadb/Dockerfile.j2
View File

@ -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'] %}

2
docker/memcached/Dockerfile.j2
View File

@ -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'] %}

2
docker/mongodb/Dockerfile.j2
View File

@ -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'] %}

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

@ -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 /

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

@ -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' %}

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

@ -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 /

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

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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'] %}

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

@ -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 /

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

@ -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 /

2
docker/rabbitmq/Dockerfile.j2
View File

@ -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'] %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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' %}

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

@ -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 /

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

@ -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' %}

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

@ -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' %}

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

@ -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 /

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

@ -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 /

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

@ -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 /

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

@ -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' %}

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

@ -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'] %}

2
docker/zaqar/Dockerfile.j2
View File

@ -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' %}

29
kolla/cmd/build.py
View File

@ -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'] = \