Add httpd and mod_ssl packages to octavia api image
Add httpd and mod_ssl packages to the octavia api container image to support configuring the TLS proxy. Change-Id: I6170b1f7256a4805dafefd82ed6c06d8c2c2a358 Related-Bug: #1789303
This commit is contained in:
parent
43a98c1443
commit
96687674dd
@ -93,6 +93,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
|||||||
# isn't valid here.
|
# isn't valid here.
|
||||||
{% set neutron_dhcp_agent_packages = ['docker', 'podman'] %}
|
{% set neutron_dhcp_agent_packages = ['docker', 'podman'] %}
|
||||||
|
|
||||||
|
# NOTE(beagles): octavia-api with TLS everywhere needs these packages
|
||||||
|
{% set octavia_api_packages_append = ['httpd', 'mod_ssl'] %}
|
||||||
|
|
||||||
# NOTE (jaosorior): redis with TLS everywhere needs these packages.
|
# NOTE (jaosorior): redis with TLS everywhere needs these packages.
|
||||||
# redis resource-agent requires pidof
|
# redis resource-agent requires pidof
|
||||||
{% set redis_packages_append = ['stunnel', 'sysvinit-tools',
|
{% set redis_packages_append = ['stunnel', 'sysvinit-tools',
|
||||||
@ -497,7 +500,10 @@ RUN mkdir -p /openstack && \
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block octavia_api_footer %}
|
{% block octavia_api_footer %}
|
||||||
RUN mkdir -p /openstack && \
|
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_octavia_extend_start; \
|
||||||
|
mkdir -p /openstack && \
|
||||||
ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-api /openstack/healthcheck && \
|
ln -s /usr/share/openstack-tripleo-common/healthcheck/octavia-api /openstack/healthcheck && \
|
||||||
chmod a+rx /openstack/healthcheck
|
chmod a+rx /openstack/healthcheck
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Add missing httpd and mod_ssl packages to octavia container image to
|
||||||
|
support TLS proxy for internal TLS.
|
Loading…
Reference in New Issue
Block a user