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 /contrib/template-override/opendaylight-template-overrides.j2 | |
| 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 'contrib/template-override/opendaylight-template-overrides.j2')
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 index eeb76c782..76d93b24f 100644 --- a/contrib/template-override/opendaylight-template-overrides.j2 +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -1,9 +1,9 @@ {% extends parent_template %} {% block opendaylight_install %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set opendaylight_packages = ['java-1.8.0-openjdk'] %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_package_type == 'deb' %} {% set opendaylight_packages = ['openjdk-8-jre'] %} {% endif %} |