openstack
/
kolla
Code Issues Proposed changes

Remove duplicate code in magnum extend_start.sh 

Change-Id: Iaa7049834be784c7410970fb9f0b25086891211d
Partial-Bug: #1546944
This commit is contained in:
Éric Lemoine 2016-02-24 12:04:02 +01:00
parent 3f8bc07270
commit feca4a3f4a
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/magnum/magnum-api/Dockerfile.j2
View File

@ -10,8 +10,8 @@ RUN yum -y install openstack-magnum-api \
{% 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_magnum_extend_start
RUN chmod 755 /usr/local/bin/kolla_magnum_extend_start
{{ include_footer }}

7
docker/magnum/magnum-api/extend_start.sh
View File

@ -1,12 +1,5 @@
#!/bin/bash
if [[ ! -d "/var/log/kolla/magnum" ]]; then
mkdir -p /var/log/kolla/magnum
fi
if [[ $(stat -c %a /var/log/kolla/magnum) != "755" ]]; then
chmod 755 /var/log/kolla/magnum
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/magnum/magnum-base/Dockerfile.j2
View File

@ -24,4 +24,5 @@ RUN ln -s magnum-base-source/* magnum \
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla magnum \
&& chmod 755 /usr/local/bin/kolla_extend_start
&& touch /usr/local/bin/kolla_magnum_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_magnum_extend_start

2
docker/magnum/magnum-base/extend_start.sh
View File

@ -6,3 +6,5 @@ fi
if [[ $(stat -c %a /var/log/kolla/magnum) != "755" ]]; then
chmod 755 /var/log/kolla/magnum
fi
source /usr/local/bin/kolla_magnum_extend_start