aboutsummaryrefslogtreecommitdiff
path: root/docker/ironic/ironic-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker/ironic/ironic-api')
-rw-r--r--docker/ironic/ironic-api/Dockerfile.j25
-rw-r--r--[-rwxr-xr-x]docker/ironic/ironic-api/extend_start.sh (renamed from docker/ironic/ironic-api/start.sh)5
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 016b3560b..6b726a419 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -13,8 +13,7 @@ RUN VER_TO_GET=$(yum --showduplicates list openstack-ironic-api | awk '/delorean
{% 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/ironic/ironic-api/start.sh b/docker/ironic/ironic-api/extend_start.sh
index 60b3ea5a0..bbbe5c7e1 100755..100644
--- a/docker/ironic/ironic-api/start.sh
+++ b/docker/ironic/ironic-api/extend_start.sh
@@ -1,7 +1,4 @@
#!/bin/bash
-set -o errexit
-
-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.
@@ -9,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
su -s /bin/sh -c "ironic-dbsync upgrade" ironic
exit 0
fi
-
-exec $CMD