From ede53b1dcbd475aa0dff339ee8dffaa9008247a9 Mon Sep 17 00:00:00 2001 From: Éric Lemoine Date: Mon, 22 Feb 2016 14:32:31 +0100 Subject: Remove duplicate code in nova extend_start.sh Change-Id: I37d737509bc7cf3dc74bb13ecb0a6ae68080556e Partial-Bug: #1546944 --- docker/nova/nova-libvirt/Dockerfile.j2 | 6 +++--- docker/nova/nova-libvirt/extend_start.sh | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'docker/nova/nova-libvirt') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index fc54c3ed8..86213750d 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -30,8 +30,8 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start \ +COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start +RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \ && useradd --user-group nova -{{ include_footer }} \ No newline at end of file +{{ include_footer }} diff --git a/docker/nova/nova-libvirt/extend_start.sh b/docker/nova/nova-libvirt/extend_start.sh index 2b6f481a0..20873d8b4 100644 --- a/docker/nova/nova-libvirt/extend_start.sh +++ b/docker/nova/nova-libvirt/extend_start.sh @@ -12,10 +12,3 @@ fi if [[ $(lsmod | grep xenfs) ]]; then mount -t xenfs xenfs /proc/xen fi - -if [[ ! -d "/var/log/kolla/nova" ]]; then - mkdir -p /var/log/kolla/nova -fi -if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then - chmod 755 /var/log/kolla/nova -fi -- cgit v1.2.3