Remove duplicate code in murano extend_start.sh
Change-Id: I32e55ce520c95b3d2c018604e925bd8d4fdf58f1 Partial-Bug: #1546944
This commit is contained in:
parent
3f8bc07270
commit
34ac0dfad2
@ -11,8 +11,8 @@ RUN apt-get install -y --no-install-recommends \
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start
|
||||||
RUN chmod 755 /usr/local/bin/kolla_extend_start
|
RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
|
||||||
|
|
||||||
{{ include_footer }}
|
{{ include_footer }}
|
||||||
|
|
||||||
|
@ -1,12 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/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
|
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
|
||||||
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
||||||
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
||||||
|
@ -29,4 +29,5 @@ RUN ln -s murano-base-source/* murano \
|
|||||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
|
|
||||||
RUN usermod -a -G kolla murano \
|
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
|
||||||
|
@ -6,3 +6,5 @@ fi
|
|||||||
if [[ $(stat -c %a /var/log/kolla/murano) != "755" ]]; then
|
if [[ $(stat -c %a /var/log/kolla/murano) != "755" ]]; then
|
||||||
chmod 755 /var/log/kolla/murano
|
chmod 755 /var/log/kolla/murano
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
source /usr/local/bin/kolla_murano_extend_start
|
||||||
|
Loading…
Reference in New Issue
Block a user