diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 18:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 18:11:30 +0000 |
| commit | 827dcbc7df6ea426c0cd1841589db57cd65a46d6 (patch) | |
| tree | 7adefc6544371a8bd7e7da372b37a99ccfbbdd7b /contrib | |
| parent | 2241efb2eb61361c9291fd137250cb5e7719384d (diff) | |
| parent | fa8e174be6bc5b4d555258197938da9da40bfa81 (diff) | |
| download | kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.tar.gz kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.zip | |
Merge "Remove support for OracleLinux"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 4 | ||||
| -rw-r--r-- | contrib/template-override/ovs-dpdk.j2 | 6 |
2 files changed, 5 insertions, 5 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 %} diff --git a/contrib/template-override/ovs-dpdk.j2 b/contrib/template-override/ovs-dpdk.j2 index 42520022e..1bfac6456 100644 --- a/contrib/template-override/ovs-dpdk.j2 +++ b/contrib/template-override/ovs-dpdk.j2 @@ -4,7 +4,7 @@ # install ovs from source -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {% set ovs_dpdk_packages = [ 'kernel-devel-$(uname -r)', 'redhat-lsb-core', @@ -22,7 +22,7 @@ 'crudini' ] %} -{% elif base_distro in [ 'debian', 'ubuntu' ] %} +{% elif base_package_type == 'deb' %} {% set ovs_dpdk_packages = [ 'linux-headers-$(uname -r)', @@ -46,7 +46,7 @@ {{ macros.install_packages(ovs_dpdk_packages | customizable("packages")) }} -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} RUN mkdir -p /lib/modules/$(uname -r) \ && ln -s /usr/src/kernels/$(uname -r) /lib/modules/$(uname -r)/build {% endif %} |