From 6992049323b271bf3856548f4a4d61482f5c4617 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 4 Sep 2015 02:15:03 -0700 Subject: [PATCH] Add 'rhel' for RPM distros Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support --- docker/ceilometer/ceilometer-alarm/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-api/Dockerfile.j2 | 3 ++- docker/ceilometer/ceilometer-central/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-collector/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 +- docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 2 +- docker/ceph/ceph-base/Dockerfile.j2 | 2 +- docker/cinder/cinder-api/Dockerfile.j2 | 2 +- docker/cinder/cinder-base/Dockerfile.j2 | 4 ++-- docker/cinder/cinder-volume/Dockerfile.j2 | 2 +- docker/designate/designate-api/Dockerfile.j2 | 2 +- docker/designate/designate-backend-bind9/Dockerfile.j2 | 2 +- docker/designate/designate-base/Dockerfile.j2 | 3 ++- docker/designate/designate-central/Dockerfile.j2 | 2 +- docker/designate/designate-mdns/Dockerfile.j2 | 2 +- docker/designate/designate-poolmanager/Dockerfile.j2 | 2 +- docker/designate/designate-sink/Dockerfile.j2 | 2 +- docker/glance/glance-base/Dockerfile.j2 | 3 ++- docker/gnocchi/gnocchi-api/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 | 4 ++-- 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 | 4 ++-- docker/kolla-ansible/Dockerfile.j2 | 2 +- docker/logging/rsyslog/Dockerfile.j2 | 3 ++- docker/magnum/magnum-api/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/neutron/neutron-agents/Dockerfile.j2 | 2 +- docker/neutron/neutron-base/Dockerfile.j2 | 3 ++- docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 4 ++-- docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 4 ++-- docker/neutron/neutron-server/Dockerfile.j2 | 4 ++-- docker/nova/nova-api/Dockerfile.j2 | 2 +- docker/nova/nova-base/Dockerfile.j2 | 4 ++-- docker/nova/nova-compute/Dockerfile.j2 | 4 ++-- 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 | 4 ++-- docker/nova/nova-novncproxy/Dockerfile.j2 | 2 +- docker/nova/nova-scheduler/Dockerfile.j2 | 2 +- docker/openvswitch/ovs-base/Dockerfile.j2 | 2 +- docker/rabbitmq/Dockerfile.j2 | 2 +- docker/swift/swift-account-server/Dockerfile.j2 | 2 +- docker/swift/swift-base/Dockerfile.j2 | 2 +- docker/swift/swift-container-server/Dockerfile.j2 | 2 +- docker/swift/swift-object-base/Dockerfile.j2 | 2 +- docker/swift/swift-object-expirer/Dockerfile.j2 | 2 +- docker/swift/swift-proxy-server/Dockerfile.j2 | 2 +- docker/zaqar/Dockerfile.j2 | 3 ++- 62 files changed, 77 insertions(+), 71 deletions(-) diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 index aa62562ac0..b7fcc7fc26 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-alarm \ && yum clean all diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 805e5e8eb0..9316ac5c5f 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum install -y openstack-ceilometer-api \ && yum clean all diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index b45c5fac33..0d7ee7147a 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-central \ && yum clean all diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index 6f425e8559..ec6ccbce9e 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-collector \ && yum clean all diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 0487af710b..60b18b9735 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-compute \ python-ceilometerclient \ diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 67fcfb50e3..bc6b30ffef 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-ceilometer-notification \ && yum clean all diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index fa7ea69a6d..b18890b5d3 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install ceph \ && yum clean all diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 196f93bafa..a430fcf651 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y python-keystone \ && yum clean all diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 21a808f9cc..02f95704bc 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-cinder \ python-automaton \ @@ -21,7 +21,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install lvm2 \ && yum clean all diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 6393798bd9..7dd8e4a0e5 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y lvm2 \ scsi-target-utils \ diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 75f4b06ee6..1e2e28e8f0 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-api \ diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 06f86c0433..3b47ff72e7 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y bind \ && yum clean all \ diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 340b98c4de..84e033c50a 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + # Install designate-api because of /etc/designate/policy.json, which # is needed in all services. This is probably a packaging bug. We do diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 771ff3c684..3c43099991 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-central \ diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index cc5f5fb89a..49d7fa7813 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-designate-mdns \ && yum clean all diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 0fc968b90e..35f99c2bf1 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # The bind9 package here is only to provide the rndc binary. RUN yum install -y \ diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index c0ea23b2d2..1d52a282b4 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-designate-sink \ diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index e447b265c0..a11e30af0e 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum -y install \ openstack-glance \ diff --git a/docker/gnocchi/gnocchi-api/Dockerfile.j2 b/docker/gnocchi/gnocchi-api/Dockerfile.j2 index 9ca70113cd..495e32f96d 100644 --- a/docker/gnocchi/gnocchi-api/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-gnocchi-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ openstack-gnocchi-api \ diff --git a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 index 99f1374a28..9f40829815 100644 --- a/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-statsd/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-gnocchi-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y openstack-gnocchi-statsd \ && yum clean all diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 2858f436a9..bda7d47ec3 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ haproxy \ diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 0e0b099078..f6d811625d 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-heat-api-cfn \ && yum clean all diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 25cbcf9f58..78981bb211 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-heat-api \ && yum clean all diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index 38e88935f0..44f62e1f73 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ python-oslo-reports \ diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index 5002d519d2..ee7b9e0281 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-heat-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \ diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index f7af3d4925..a3ba0825bc 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-dashboard \ @@ -32,7 +32,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ httpd \ diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 5bce3bddaf..e628c9ffce 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-ironic-api \ diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 523c223ec1..a283721d6a 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # until packaging is fixed, all of this is required # api: policy diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index d380332300..992a2cb8b2 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-ironic-conductor \ diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2 index cb4e8b80f8..799d70e78a 100644 --- a/docker/ironic/ironic-discoverd/Dockerfile.j2 +++ b/docker/ironic/ironic-discoverd/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-ironic-discoverd \ diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 325e4c2c5c..6821b41265 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ hostname \ diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 1a60da0ff3..774262edaa 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-keystone \ python-keystoneclient \ @@ -31,7 +31,7 @@ RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-ena {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} RUN yum -y install \ httpd \ diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index e0450ffc8e..6238a2f5cf 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ git \ diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index 041cc843f4..4ea34df4d2 100755 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -1,7 +1,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum -y install \ rsyslog \ && yum clean all diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2 index e208a115ed..cb49ec7fa6 100644 --- a/docker/magnum/magnum-api/Dockerfile.j2 +++ b/docker/magnum/magnum-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-magnum-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-magnum-api \ && yum clean all diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index c143700854..02b1f42aa2 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-magnum-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-magnum-conductor \ tar \ diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index 38e66ee148..984c5d2681 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y \ MariaDB-Galera-server \ diff --git a/docker/memcached/Dockerfile.j2 b/docker/memcached/Dockerfile.j2 index 0c0111f7e1..2be3f025e9 100644 --- a/docker/memcached/Dockerfile.j2 +++ b/docker/memcached/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install memcached \ && yum clean all diff --git a/docker/mongodb/Dockerfile.j2 b/docker/mongodb/Dockerfile.j2 index ee82f0b7a1..13bc6ed026 100644 --- a/docker/mongodb/Dockerfile.j2 +++ b/docker/mongodb/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ mongodb \ diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 590443e00e..9fca4f9c90 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) -{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum install -y supervisor \ && yum clean all diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 4b96b68aba..e9a6ffb113 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum -y install openstack-neutron \ openstack-neutron-ml2 \ diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 58d5ae6c38..0c116607cf 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages RUN yum install -y \ @@ -12,7 +12,7 @@ RUN yum install -y \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages RUN yum install -y ebtables && yum clean all diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index ad12e55111..9c0d45b276 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages RUN yum install -y \ @@ -12,7 +12,7 @@ RUN yum install -y \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages RUN yum install -y \ diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 9cfe634c47..69d5a7f728 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} # Install required packages RUN yum install -y which \ @@ -14,7 +14,7 @@ RUN pip install oslo.messaging==2.2.0 {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} #Install required packages RUN yum install -y which \ diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index b906d19378..c704a528f0 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-nova-api \ && yum clean all diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index f6ec8c3e13..293cbaeead 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-nova-common \ @@ -19,7 +19,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ bridge-utils \ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index a8a719023c..0f60de7a40 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-nova-compute \ openvswitch \ @@ -11,7 +11,7 @@ RUN yum -y install openstack-nova-compute \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ sysfsutils \ diff --git a/docker/nova/nova-conductor/Dockerfile.j2 b/docker/nova/nova-conductor/Dockerfile.j2 index 0f42df5c99..d45cc95382 100644 --- a/docker/nova/nova-conductor/Dockerfile.j2 +++ b/docker/nova/nova-conductor/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-nova-conductor \ diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index 1c8d9ea122..f04236e246 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-nova-console \ && yum clean all diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 36fad3a292..cbf0c2a640 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ libvirt-daemon \ diff --git a/docker/nova/nova-network/Dockerfile.j2 b/docker/nova/nova-network/Dockerfile.j2 index 60ea394aaf..be36a2d5fb 100644 --- a/docker/nova/nova-network/Dockerfile.j2 +++ b/docker/nova/nova-network/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-nova-network \ @@ -12,7 +12,7 @@ RUN yum -y install \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install initscripts \ && yum clean all diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 1a90e4f01f..c203d45d2f 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ novnc \ diff --git a/docker/nova/nova-scheduler/Dockerfile.j2 b/docker/nova/nova-scheduler/Dockerfile.j2 index 5dd0fd5074..f587d3b611 100644 --- a/docker/nova/nova-scheduler/Dockerfile.j2 +++ b/docker/nova/nova-scheduler/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-nova-scheduler \ && yum clean all diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 index fd8eac1af1..4958297c01 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/ovs-base/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if install_type == 'source' %} # TODO(sdake): groan openvswitch is only in the RDO repos diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 1baf2ce808..cd8cb5dbb2 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -1,7 +1,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) -{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ hostname \ diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2 index 7320de9f41..54fe57fa95 100644 --- a/docker/swift/swift-account-server/Dockerfile.j2 +++ b/docker/swift/swift-account-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-account \ diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 6ffbe35778..03c41c2bd9 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-swift && yum clean all diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2 index 1a08c0f5dc..c68b983eba 100644 --- a/docker/swift/swift-container-server/Dockerfile.j2 +++ b/docker/swift/swift-container-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-container \ diff --git a/docker/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2 index 54997a1145..cd56891776 100644 --- a/docker/swift/swift-object-base/Dockerfile.j2 +++ b/docker/swift/swift-object-base/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-object \ diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2 index af9f3eb580..1e8e0e826e 100644 --- a/docker/swift/swift-object-expirer/Dockerfile.j2 +++ b/docker/swift/swift-object-expirer/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ t MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install \ openstack-swift-proxy \ diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2 index 54d024f8b7..bdd9836493 100644 --- a/docker/swift/swift-proxy-server/Dockerfile.j2 +++ b/docker/swift/swift-proxy-server/Dockerfile.j2 @@ -2,7 +2,7 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install openstack-swift-proxy && yum clean all diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index b20e8bd4e3..5661744c21 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -2,7 +2,8 @@ FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + RUN yum -y install openstack-zaqar && yum clean all