diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 15:58:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 15:58:10 +0000 |
| commit | bbed8e92c3c4638af38fb80e2ad298146a6e9dfe (patch) | |
| tree | 02c8dcf6edc14bfa88b2898d52c51d0df57be545 /docker | |
| parent | ef5e88a9f31648eb6416dc076cb1f92b01159dc8 (diff) | |
| parent | 34ac0dfad21b02d7b94f3239a420e998c04f8ea2 (diff) | |
| download | kolla-bbed8e92c3c4638af38fb80e2ad298146a6e9dfe.tar.gz kolla-bbed8e92c3c4638af38fb80e2ad298146a6e9dfe.zip | |
Merge "Remove duplicate code in murano extend_start.sh"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/murano/murano-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/murano/murano-base/extend_start.sh | 2 |
4 files changed, 6 insertions, 10 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 diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 49e372581..26fc7618e 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -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 diff --git a/docker/murano/murano-base/extend_start.sh b/docker/murano/murano-base/extend_start.sh index 1f94551d7..66dde46ed 100644 --- a/docker/murano/murano-base/extend_start.sh +++ b/docker/murano/murano-base/extend_start.sh @@ -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 |