diff options
| author | Éric Lemoine <elemoine@mirantis.com> | 2016-02-24 11:57:55 +0100 |
|---|---|---|
| committer | Éric Lemoine <elemoine@mirantis.com> | 2016-02-24 11:57:56 +0100 |
| commit | 93b5c12abf37692c8c15d62ba98d002fe2a774df (patch) | |
| tree | 8dfb43d945f9a7a14b2a6153a9418049048d320e /docker/heat | |
| parent | 3f8bc072706dc7dfb064ea37813dc2ccc3d87e31 (diff) | |
| download | kolla-93b5c12abf37692c8c15d62ba98d002fe2a774df.tar.gz kolla-93b5c12abf37692c8c15d62ba98d002fe2a774df.zip | |
Remove duplicate code in heat extend_start.sh
Change-Id: I8970d02ccbed1dfc221683e273edc2680207056b
Partial-Bug: #1546944
Diffstat (limited to 'docker/heat')
| -rw-r--r-- | docker/heat/heat-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/heat/heat-api/extend_start.sh | 7 | ||||
| -rw-r--r-- | docker/heat/heat-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/heat/heat-base/extend_start.sh | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2 index 358f44fdd..a7e9ed89b 100644 --- a/docker/heat/heat-api/Dockerfile.j2 +++ b/docker/heat/heat-api/Dockerfile.j2 @@ -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 }} diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index 2eb7468f5..ca4f83da5 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -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 diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2 index bbdce7e90..e7507a66c 100644 --- a/docker/heat/heat-base/Dockerfile.j2 +++ b/docker/heat/heat-base/Dockerfile.j2 @@ -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 diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh index 9cdefa6ad..de43a519c 100644 --- a/docker/heat/heat-base/extend_start.sh +++ b/docker/heat/heat-base/extend_start.sh @@ -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 |