diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 15:05:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 15:05:22 +0000 |
| commit | 7168f3c4306d5095fc0092972f734d10392a91a9 (patch) | |
| tree | 55bda4e036467d0876f27532c886b853ed30f848 | |
| parent | c22af045e6a056d0771b31f47bfb7a7c837daa65 (diff) | |
| parent | 62781f455007310cbae34aeb7bcbbad0cf58e5df (diff) | |
| download | kolla-7168f3c4306d5095fc0092972f734d10392a91a9.tar.gz kolla-7168f3c4306d5095fc0092972f734d10392a91a9.zip | |
Merge "repair rally dockerfile"
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/rally/extend_start.sh | 15 |
2 files changed, 21 insertions, 2 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 index 77950d855..503fcad7f 100644 --- a/docker/rally/Dockerfile.j2 +++ b/docker/rally/Dockerfile.j2 @@ -17,12 +17,16 @@ RUN useradd --user-group rally ADD rally-archive /rally-source RUN ln -s rally-source/* rally \ + && useradd --user-group rally \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /rally \ - && mkdir -p /etc/rally /var/log/rally \ - && useradd --user-group rally + && mkdir -p /etc/rally /var/log/rally /home/rally \ + && chown -R rally: /etc/rally /var/log/rally /home/rally {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + RUN usermod -a -G kolla rally {% block rally_footer %}{% endblock %} diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh new file mode 100644 index 000000000..a3af2c96e --- /dev/null +++ b/docker/rally/extend_start.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# 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 + rally-manage db recreate + exit 0 +fi + +if [[ ! -d "/var/log/kolla/rally" ]]; then + mkdir -p /var/log/kolla/rally +fi +if [[ $(stat -c %a /var/log/kolla/rally) != "755" ]]; then + chmod 755 /var/log/kolla/rally +fi |