openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Fix missing docker package in neutron L3 agent container" into stable/queens

This commit is contained in:
Zuul 2018-04-28 17:45:12 +00:00 committed by Gerrit Code Review
parent c498165f2e c5d3a943bc
commit 0b515a916d
1 changed files with 3 additions and 1 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

@ -67,7 +67,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
chmod a+rx /openstack/healthcheck
{% endblock %}
{% set neutron_l3_agent_packages = ['docker'] %}
{% set neutron_l3_agent_packages_append = ['docker'] %}
# Kolla doesn't currently neutron_dhcp_agent_packages on CentOS so the append
# isn't valid here.
{% set neutron_dhcp_agent_packages = ['docker'] %}
# NOTE (jaosorior): redis with TLS everywhere needs these packages.