diff options
Diffstat (limited to 'docker/nova/nova-api')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/nova/nova-api/extend_start.sh (renamed from docker/nova/nova-api/start.sh) | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index e0d7a0db0..6ee313bd1 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -10,8 +10,7 @@ RUN yum -y install openstack-nova-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/nova/nova-api/start.sh b/docker/nova/nova-api/extend_start.sh index 6461777ca..2aaad1e8b 100755..100644 --- a/docker/nova/nova-api/start.sh +++ b/docker/nova/nova-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. @@ -10,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then su -s /bin/sh -c "nova-manage db sync" nova exit 0 fi - -exec $CMD |