openstack
/
kolla
Code Issues Proposed changes

Remove duplicate code in heat extend_start.sh 

Change-Id: I8970d02ccbed1dfc221683e273edc2680207056b
Partial-Bug: #1546944
This commit is contained in:
Éric Lemoine 2016-02-24 11:57:55 +01:00
parent 3f8bc07270
commit 93b5c12abf
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/heat/heat-api/Dockerfile.j2
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_heat_extend_start
RUN chmod 755 /usr/local/bin/kolla_heat_extend_start
{{ include_footer }}

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

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

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

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

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