aboutsummaryrefslogtreecommitdiff
path: root/docker/murano/murano-api
diff options
context:
space:
mode:
authorÉric Lemoine <elemoine@mirantis.com>2016-02-24 12:10:22 +0100
committerÉric Lemoine <elemoine@mirantis.com>2016-02-24 12:10:34 +0100
commit34ac0dfad21b02d7b94f3239a420e998c04f8ea2 (patch)
tree849bcef3d828f1ad747e5ccfc070494965a0e100 /docker/murano/murano-api
parent3f8bc072706dc7dfb064ea37813dc2ccc3d87e31 (diff)
downloadkolla-34ac0dfad21b02d7b94f3239a420e998c04f8ea2.tar.gz
kolla-34ac0dfad21b02d7b94f3239a420e998c04f8ea2.zip
Remove duplicate code in murano extend_start.sh
Change-Id: I32e55ce520c95b3d2c018604e925bd8d4fdf58f1 Partial-Bug: #1546944
Diffstat (limited to 'docker/murano/murano-api')
-rw-r--r--docker/murano/murano-api/Dockerfile.j24
-rw-r--r--docker/murano/murano-api/extend_start.sh7
2 files changed, 2 insertions, 9 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index 7d57d9c7f..76b23f939 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -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 }}
diff --git a/docker/murano/murano-api/extend_start.sh b/docker/murano/murano-api/extend_start.sh
index a00a46503..d46b2b0af 100644
--- a/docker/murano/murano-api/extend_start.sh
+++ b/docker/murano/murano-api/extend_start.sh
@@ -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