From f8191dd20fadf851b6d59ca9e29bcfd84e8a9060 Mon Sep 17 00:00:00 2001 From: Quique Llorente Date: Wed, 10 Apr 2019 14:24:29 +0200 Subject: [PATCH] Make ovn package python version aware After merging [1] fedora28 container build is failing [2], the issue is that fedora28 package name is python3-networking-ovn, this review uses this name for python3 distros. Closes-Bug: #1824141 [1] https://review.openstack.org/#/c/644587/ [2] http://logs.rdoproject.org/openstack-periodic/git.openstack.org/openstack-infra/tripleo-ci/master/periodic-tripleo-fedora-28-master-containers-build-push/bab384a/logs/build.log.txt.gz Change-Id: Ic01d8232cb9385c415fb46cdd401e4dff301e6ee --- container-images/tripleo_kolla_template_overrides.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 24f02acfd..af0e2d6f8 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -136,7 +136,11 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ # isn't valid here. {% set neutron_dhcp_agent_packages = ['docker', 'podman', 'libseccomp'] %} +{% if distro_python_version.startswith('3') %} +{% set octavia_api_packages_append = ['python3-networking-ovn'] %} +{% else %} {% set octavia_api_packages_append = ['python-networking-ovn'] %} +{% endif %} # NOTE (jaosorior): redis with TLS everywhere needs these packages. # redis resource-agent requires pidof