Remove duplicate code in cinder extend_start.sh

Change-Id: I71953c905b978176bf7dc6bcaf3c4766be4b60fb
Partial-Bug: #1546944
This commit is contained in:
Éric Lemoine 2016-02-24 11:48:06 +01:00
parent 3f8bc07270
commit 1382e39f16
4 changed files with 6 additions and 10 deletions

View File

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

View File

@ -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

View File

@ -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

View File

@ -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