diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 15:01:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 15:01:58 +0000 |
| commit | 6b4e726bae07318417c69b490d4e0ad15230c7c1 (patch) | |
| tree | 1104d8872fa30395c49995cc0dd6a1a770652211 /docker/nova/nova-api | |
| parent | 5bf932c7b8e981a1df544c568dcbd186d790ab14 (diff) | |
| parent | ede53b1dcbd475aa0dff339ee8dffaa9008247a9 (diff) | |
| download | kolla-6b4e726bae07318417c69b490d4e0ad15230c7c1.tar.gz kolla-6b4e726bae07318417c69b490d4e0ad15230c7c1.zip | |
Merge "Remove duplicate code in nova extend_start.sh"
Diffstat (limited to 'docker/nova/nova-api')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-api/extend_start.sh | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 8f5680b42..023331e54 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -17,8 +17,8 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} {% 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 {{ include_footer }} diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index a94a22740..c7bc9c862 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -1,12 +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 |