openstack/tripleo-common
Code Issues Proposed changes

Merge "Install python2-networking-ansible in neutron-server"

Browse Source
This commit is contained in:
Zuul
2018-07-03 00:17:40 +00:00
committed by Gerrit Code Review
parent 78aa4bfa09 2d4c5d351d
commit 8c4178c6cc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
container-images/tripleo_kolla_template_overrides.j2
View File

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