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-base/Dockerfile.j2 | 4 +++- docker/nova/nova-base/extend_start.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/nova/nova-base') diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index abf8050b4..db46bc7cf 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -56,6 +56,8 @@ RUN chmod 750 /etc/sudoers.d \ {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_nova_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_nova_extend_start RUN usermod -a -G kolla nova diff --git a/docker/nova/nova-base/extend_start.sh b/docker/nova/nova-base/extend_start.sh index 11b4b95d6..31ac31e4b 100644 --- a/docker/nova/nova-base/extend_start.sh +++ b/docker/nova/nova-base/extend_start.sh @@ -6,3 +6,5 @@ fi if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then chmod 755 /var/log/kolla/nova fi + +source /usr/local/bin/kolla_nova_extend_start -- cgit v1.2.3