diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 15:56:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 15:56:43 +0000 |
| commit | 99411a97d21ecf6d6549ef89d07d55a58b9065cd (patch) | |
| tree | 93c97449cab93dcaeb612074b1239b0c8c2a43ae /docker | |
| parent | 93b5c12abf37692c8c15d62ba98d002fe2a774df (diff) | |
| parent | 63e2c64081c384548daff46b5db8dfa3c97f9c25 (diff) | |
| download | kolla-99411a97d21ecf6d6549ef89d07d55a58b9065cd.tar.gz kolla-99411a97d21ecf6d6549ef89d07d55a58b9065cd.zip | |
Merge "Remove duplicate code in glance extend_start.sh"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/glance/glance-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/glance/glance-base/extend_start.sh | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2 index 60945a6fe..f195defdd 100644 --- a/docker/glance/glance-api/Dockerfile.j2 +++ b/docker/glance/glance-api/Dockerfile.j2 @@ -1,8 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}glance-base:{{ tag }} MAINTAINER {{ maintainer }} -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_glance_extend_start +RUN chmod 755 /usr/local/bin/kolla_glance_extend_start {{ include_footer }} diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index aa0372fdc..4b99201c9 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-api/extend_start.sh @@ -1,12 +1,5 @@ #!/bin/bash -if [[ ! -d "/var/log/kolla/glance" ]]; then - mkdir -p /var/log/kolla/glance -fi -if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then - chmod 755 /var/log/kolla/glance -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/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 74edfc72d..c1f3519f9 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -56,4 +56,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN usermod -a -G kolla glance \ && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/glance_sudoers \ - && chmod 755 /usr/local/bin/kolla_extend_start + && touch /usr/local/bin/kolla_glance_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start diff --git a/docker/glance/glance-base/extend_start.sh b/docker/glance/glance-base/extend_start.sh index 467a2e188..e8a60bf64 100644 --- a/docker/glance/glance-base/extend_start.sh +++ b/docker/glance/glance-base/extend_start.sh @@ -6,3 +6,5 @@ fi if [[ $(stat -c %a /var/log/kolla/glance) != "755" ]]; then chmod 755 /var/log/kolla/glance fi + +source /usr/local/bin/kolla_glance_extend_start |