diff options
| author | yj.bai <bai.yongjun@99cloud.net> | 2020-02-20 15:54:42 +0800 |
|---|---|---|
| committer | yj.bai <bai.yongjun@99cloud.net> | 2020-02-23 15:18:01 +0800 |
| commit | c402f20e3e4c42bf59094c8d298cc679adeb85ee (patch) | |
| tree | 0903fb76c8641e4961d89adbd825d0889eaf0fba /docker | |
| parent | 1b0884af8a4dc90b459c2557acdf987ad0a7df75 (diff) | |
| download | kolla-c402f20e3e4c42bf59094c8d298cc679adeb85ee.tar.gz kolla-c402f20e3e4c42bf59094c8d298cc679adeb85ee.zip | |
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 <bai.yongjun@99cloud.net>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/heat/heat-api-cfn/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/heat/heat-api-cfn/extend_start.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2 index 5f25ab074..272c22c7f 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 000000000..c55f0b199 --- /dev/null +++ b/docker/heat/heat-api-cfn/extend_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +. /usr/local/bin/kolla_httpd_setup |