aboutsummaryrefslogtreecommitdiff
path: root/docker/masakari
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-09-18 12:40:59 +0100
committerMark Goddard <mark@stackhpc.com>2019-09-18 13:42:47 +0100
commitfa8e174be6bc5b4d555258197938da9da40bfa81 (patch)
treee032e8a421baa675a6188f1ba1a07616ba8193b9 /docker/masakari
parent1c86301f286cb7f90097496caec3ebf62a1f0d22 (diff)
downloadkolla-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/masakari')
-rw-r--r--docker/masakari/masakari-monitors/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2
index 8ed265b17..2039b556a 100644
--- a/docker/masakari/masakari-monitors/Dockerfile.j2
+++ b/docker/masakari/masakari-monitors/Dockerfile.j2
@@ -14,7 +14,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% if base_package_type == 'rpm' %}
{% set masakari_monitors_packages = [
'libvirt-devel',
@@ -22,7 +22,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
'tcpdump',
] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
+ {% elif base_package_type == 'deb' %}
{% set masakari_monitors_packages = [
'libvirt-dev',