openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Install python2-networking-baremetal in neutron-server" into stable/queens

This commit is contained in:
Zuul 2019-08-16 18:24:14 +00:00 committed by Gerrit Code Review
parent 7b3dad2d0e adba284eaa
commit 4e33355a2c
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

@ -58,9 +58,11 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
# NOTE (jaosorior): neutron-server with TLS everywhere needs httpd and mod_ssl packages.
# NOTE (ramishra): python2-networking-ansible ML2 plug-in for neutron ansible integration.
# NOTE (hjensas): python2-networking-baremetal ML2 plug-in for ironic neutron integration.
{% set neutron_server_packages_append = ['httpd',
'mod_ssl',
'python2-networking-ansible'] %}
'python2-networking-ansible',
'python2-networking-baremetal'] %}
{% block neutron_server_footer %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \