diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-09-18 12:40:59 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-09-18 13:42:47 +0100 |
| commit | fa8e174be6bc5b4d555258197938da9da40bfa81 (patch) | |
| tree | e032e8a421baa675a6188f1ba1a07616ba8193b9 /docker/cyborg | |
| parent | 1c86301f286cb7f90097496caec3ebf62a1f0d22 (diff) | |
| download | kolla-fa8e174be6bc5b4d555258197938da9da40bfa81.tar.gz kolla-fa8e174be6bc5b4d555258197938da9da40bfa81.zip | |
Remove support for OracleLinux
We have agreed to remove support for Oracle Linux.
http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html
Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39
Depends-On: https://review.opendev.org/682858
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index 0d1857220..8e82f7179 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -10,12 +10,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set cyborg_api_packages = [ 'mod_ssl', 'mod_wsgi' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set cyborg_api_packages = [ 'apache2', 'libapache2-mod-wsgi' @@ -26,11 +26,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} RUN echo > /etc/apache2/ports.conf {% endif %} |