openstack
/
kolla
Code Issues Proposed changes

Remove duplicate code in murano extend_start.sh 

Change-Id: I32e55ce520c95b3d2c018604e925bd8d4fdf58f1
Partial-Bug: #1546944
This commit is contained in:
Éric Lemoine 2016-02-24 12:10:22 +01:00
parent 3f8bc07270
commit 34ac0dfad2
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/murano/murano-api/Dockerfile.j2
View File

@ -11,8 +11,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_murano_extend_start
RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
{{ include_footer }}

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

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

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

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

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