openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove duplicate code in glance extend_start.sh"

Browse Source
This commit is contained in:
Jenkins 2016-02-24 15:56:43 +00:00 committed by Gerrit Code Review
commit 99411a97d2
4 changed files with 6 additions and 10 deletions

4
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 }}

7
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

3
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

2
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