diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-22 14:32:31 +0100 |
|---|---|---|
| committer | Éric Lemoine <elemoine@mirantis.com> | 2016-02-23 08:58:46 +0100 |
| commit | ede53b1dcbd475aa0dff339ee8dffaa9008247a9 (patch) | |
| tree | 20b4de6014c193863381179dac5f69179a596b11 /docker/nova/nova-compute | |
| parent | 33fd50e603d48de4f1f2fc25ba649561efc25cac (diff) | |
| download | kolla-ede53b1dcbd475aa0dff339ee8dffaa9008247a9.tar.gz kolla-ede53b1dcbd475aa0dff339ee8dffaa9008247a9.zip | |
Remove duplicate code in nova extend_start.sh
Change-Id: I37d737509bc7cf3dc74bb13ecb0a6ae68080556e
Partial-Bug: #1546944
Diffstat (limited to 'docker/nova/nova-compute')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-compute/extend_start.sh | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 9b2bd3792..2df1523bb 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -52,8 +52,8 @@ RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements {% endif %} COPY nova_compute_sudoers /etc/sudoers.d/nova_compute_sudoers -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 \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/nova_compute_sudoers \ && rm -f /etc/machine-id diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh index 4310189c7..efe531ff9 100644 --- a/docker/nova/nova-compute/extend_start.sh +++ b/docker/nova/nova-compute/extend_start.sh @@ -1,13 +1,5 @@ #!/bin/bash - -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 - # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then |