diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-02 20:05:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-02 20:05:41 +0000 |
| commit | 96d4e1ad3afec83de6e019a051686e05c6611c25 (patch) | |
| tree | ac2428487db72b5e922b696c78debc9b2ed31f31 | |
| parent | 3fd9649e95013cc20d2efbbbc7ef44e90ff0bdf8 (diff) | |
| parent | c402f20e3e4c42bf59094c8d298cc679adeb85ee (diff) | |
| download | kolla-96d4e1ad3afec83de6e019a051686e05c6611c25.tar.gz kolla-96d4e1ad3afec83de6e019a051686e05c6611c25.zip | |
Merge "Add Apache httpd setup to heat-api-cfn"
| -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 cede0ca7b..d5fd36531 100644 --- a/docker/heat/heat-api-cfn/Dockerfile.j2 +++ b/docker/heat/heat-api-cfn/Dockerfile.j2 @@ -16,6 +16,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 |