diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-22 09:34:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-22 09:34:08 +0000 |
| commit | d79ca609c5e58b2d56cd617e48314a73c41ad6f9 (patch) | |
| tree | 28320096432aa4faacdb19caa4f18b11f40e4904 /docker | |
| parent | 4196603f854f281464c8a8639da541ea32be59fa (diff) | |
| parent | 210263111007bfced1ba47d0b777746e0451e051 (diff) | |
| download | kolla-d79ca609c5e58b2d56cd617e48314a73c41ad6f9.tar.gz kolla-d79ca609c5e58b2d56cd617e48314a73c41ad6f9.zip | |
Merge "implement Ansible Tempest role"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/tempest/extend_start.sh | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 index dc7a04f7b..8b389116d 100644 --- a/docker/tempest/Dockerfile.j2 +++ b/docker/tempest/Dockerfile.j2 @@ -25,6 +25,11 @@ RUN ln -s tempest-source/* tempest \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /tempest \ && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock +WORKDIR /tempest + {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + {{ include_footer }} diff --git a/docker/tempest/extend_start.sh b/docker/tempest/extend_start.sh new file mode 100644 index 000000000..48397041f --- /dev/null +++ b/docker/tempest/extend_start.sh @@ -0,0 +1,8 @@ +#! /bin/bash + +if [[ ! -d "/var/log/kolla/tempest" ]]; then + mkdir -p /var/log/kolla/tempest +fi +if [[ $(stat -c %a /var/log/kolla/tempest) != "755" ]]; then + chmod 755 /var/log/kolla/tempest +fi |