diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 15:57:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 15:57:05 +0000 |
| commit | 8a3a5e7f0e22349f8096dd6ba06b6f399069454b (patch) | |
| tree | d695f1d938e4f66f164697ec99a07e470ffe1ac9 /docker | |
| parent | 99411a97d21ecf6d6549ef89d07d55a58b9065cd (diff) | |
| parent | 1382e39f162d827199a8baa39cffb9c1812cc3c1 (diff) | |
| download | kolla-8a3a5e7f0e22349f8096dd6ba06b6f399069454b.tar.gz kolla-8a3a5e7f0e22349f8096dd6ba06b6f399069454b.zip | |
Merge "Remove duplicate code in cinder extend_start.sh"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/cinder/cinder-base/extend_start.sh | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index d9b819e5d..60c69a7c5 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -16,8 +16,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_cinder_extend_start +RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start {{ include_footer }} diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index f6e2ddb20..176515189 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -1,13 +1,6 @@ #!/bin/bash set -o errexit -if [[ ! -d "/var/log/kolla/cinder" ]]; then - mkdir -p /var/log/kolla/cinder -fi -if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then - chmod 755 /var/log/kolla/cinder -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 diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 46e87198a..46eddd25e 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -58,4 +58,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN usermod -a -G kolla cinder \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/cinder_sudoers \ - && chmod 755 /usr/local/bin/kolla_extend_start + && touch /usr/local/bin/kolla_cinder_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_cinder_extend_start diff --git a/docker/cinder/cinder-base/extend_start.sh b/docker/cinder/cinder-base/extend_start.sh index 2652bf264..6c655da29 100644 --- a/docker/cinder/cinder-base/extend_start.sh +++ b/docker/cinder/cinder-base/extend_start.sh @@ -6,3 +6,5 @@ fi if [[ $(stat -c %a /var/log/kolla/cinder) != "755" ]]; then chmod 755 /var/log/kolla/cinder fi + +source /usr/local/bin/kolla_cinder_extend_start |