aboutsummaryrefslogtreecommitdiff
path: root/docker/heat/heat-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker/heat/heat-api')
-rw-r--r--docker/heat/heat-api/Dockerfile.j25
-rw-r--r--[-rwxr-xr-x]docker/heat/heat-api/extend_start.sh (renamed from docker/heat/heat-api/start.sh)6
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index 19eb89777..e425e4ebc 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -10,8 +10,7 @@ RUN yum -y install openstack-heat-api \
{% endif %}
{% endif %}
-COPY start.sh /
-
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
{{ include_footer }}
diff --git a/docker/heat/heat-api/start.sh b/docker/heat/heat-api/extend_start.sh
index b451c604c..17bd742e3 100755..100644
--- a/docker/heat/heat-api/start.sh
+++ b/docker/heat/heat-api/extend_start.sh
@@ -1,8 +1,4 @@
#!/bin/bash
-set -o errexit
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty.
@@ -13,5 +9,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
openstack role add --domain heat_user_domain --user heat_domain_admin admin
exit 0
fi
-
-exec $CMD