openstack/tripleo-common
Code Issues Proposed changes

Make ovn package python version aware

Browse Source 
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
This commit is contained in:
Quique Llorente 2019-04-10 14:24:29 +02:00
parent 3300af4827
commit f8191dd20f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container-images/tripleo_kolla_template_overrides.j2
View File

@ -136,7 +136,11 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
# isn't valid here. # isn't valid here.
{% set neutron_dhcp_agent_packages = ['docker', 'podman', 'libseccomp'] %} {% 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'] %} {% set octavia_api_packages_append = ['python-networking-ovn'] %}
{% endif %}
# NOTE (jaosorior): redis with TLS everywhere needs these packages. # NOTE (jaosorior): redis with TLS everywhere needs these packages.
# redis resource-agent requires pidof # redis resource-agent requires pidof