openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Make ovn package python version aware"

This commit is contained in:
Zuul 2019-04-10 21:12:16 +00:00 committed by Gerrit Code Review
parent 1920ecc911 f8191dd20f
commit 9767e775e7
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.
{% 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