openstack/tripleo-common
Code Issues Proposed changes

Merge "Cleanup mistral-api override"

Browse Source
This commit is contained in:
Zuul 2018-01-08 18:21:22 +00:00 committed by Gerrit Code Review
commit 9834382b25
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container-images/tripleo_kolla_template_overrides.j2
View File

@ -49,14 +49,6 @@ gpgkey=https://sensu.global.ssl.fastly.net/yum/pubkey.gpg' >> /etc/yum.repos.d/s
# the undercloud baremetal workflows.
{% set mistral_executor_packages_append = ['openstack-nova-common'] %}
# NOTE(mandre) remove once https://review.openstack.org/#/c/513089/ merges
{% set mistral_api_packages_append = ['httpd','mod_ssl', 'mod_wsgi'] %}
{% block mistral_api_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 \
&& echo "if [[ "\$\(whoami\)" == 'root' ]]; then rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*; fi" >> /usr/local/bin/kolla_mistral_extend_start
{% endblock %}
# FIXME (kolla review to add ceilometer to swift proxy image)
# NOTE (jaosorior): swift proxy with TLS everywhere needs these packages.
# NOTE(mandre) Apache cleanup done below in swift_proxy_server_footer block