From c402f20e3e4c42bf59094c8d298cc679adeb85ee Mon Sep 17 00:00:00 2001 From: "yj.bai" Date: Thu, 20 Feb 2020 15:54:42 +0800 Subject: [PATCH] Add Apache httpd setup to heat-api-cfn will change heat-api-cfn up way from python to apache. and add tls. https://review.opendev.org/#/c/707131/ Related: blueprint add-ssl-internal-network Change-Id: Ifa6157cf495ff735e1d45899ecaf83a84bf9f793 Signed-off-by: yj.bai --- docker/heat/heat-api-cfn/Dockerfile.j2 | 3 +++ docker/heat/heat-api-cfn/extend_start.sh | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 docker/heat/heat-api-cfn/extend_start.sh diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 5f25ab074e..272c22c7f4 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -14,6 +14,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }} {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start +RUN chmod 755 /usr/local/bin/kolla_heat_extend_start + {% block heat_api_cfn_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/heat/heat-api-cfn/extend_start.sh b/docker/heat/heat-api-cfn/extend_start.sh new file mode 100644 index 0000000000..c55f0b1995 --- /dev/null +++ b/docker/heat/heat-api-cfn/extend_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +. /usr/local/bin/kolla_httpd_setup