diff options
Diffstat (limited to 'docker/nova/nova-libvirt')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/nova/nova-libvirt/extend_start.sh (renamed from docker/nova/nova-libvirt/start.sh) | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 28be92470..514c49d49 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -27,8 +27,7 @@ RUN apt-get install -y --no-install-recommends \ {% 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-libvirt/start.sh b/docker/nova/nova-libvirt/extend_start.sh index df3b0e5a9..cdfe1f928 100755..100644 --- a/docker/nova/nova-libvirt/start.sh +++ b/docker/nova/nova-libvirt/extend_start.sh @@ -1,8 +1,4 @@ #!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh # TODO(SamYaple): Tweak libvirt.conf rather than change permissions. # Fix permissions for libvirt @@ -11,5 +7,3 @@ if [[ -c /dev/kvm ]]; then chmod 660 /dev/kvm chown root:kvm /dev/kvm fi - -exec $CMD |