aboutsummaryrefslogtreecommitdiff
path: root/docker/glance/glance-api
diff options
context:
space:
mode:
authorÉric Lemoine <elemoine@mirantis.com>2016-02-24 11:41:23 +0100
committerÉric Lemoine <elemoine@mirantis.com>2016-02-24 11:41:24 +0100
commit63e2c64081c384548daff46b5db8dfa3c97f9c25 (patch)
tree0a0fee216c8c09b928476ae137532bffcc17bbaa /docker/glance/glance-api
parent3f8bc072706dc7dfb064ea37813dc2ccc3d87e31 (diff)
downloadkolla-63e2c64081c384548daff46b5db8dfa3c97f9c25.tar.gz
kolla-63e2c64081c384548daff46b5db8dfa3c97f9c25.zip
Remove duplicate code in glance extend_start.sh
Change-Id: I34f63aef2a473c475f3740e160f64e6c1ee758fc Partial-Bug: #1546944
Diffstat (limited to 'docker/glance/glance-api')
-rw-r--r--docker/glance/glance-api/Dockerfile.j24
-rw-r--r--docker/glance/glance-api/extend_start.sh7
2 files changed, 2 insertions, 9 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