diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-10 17:31:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-10 17:31:13 +0000 |
| commit | 66c5612b7aa3f58143ce36f2ccc4791d281507bc (patch) | |
| tree | bf6909e753d6b8fb62bfb7b9cabfc297a58c93d4 /docker | |
| parent | 945e240aee07dffb48af2cc8866b87204de5ba82 (diff) | |
| parent | 096ebf74655b81bfef5a4bb5a01da6c26a57de54 (diff) | |
| download | kolla-66c5612b7aa3f58143ce36f2ccc4791d281507bc.tar.gz kolla-66c5612b7aa3f58143ce36f2ccc4791d281507bc.zip | |
Merge "Remove unnecessary /var/log/sahara directory"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/sahara/sahara-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index a6324a22b..5ee1e3ac0 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -20,9 +20,9 @@ ADD sahara-base-archive /sahara-base-source RUN ln -s sahara-base-source/* sahara \ && useradd --user-group sahara \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /sahara \ - && mkdir -p /etc/sahara /var/log/sahara /home/sahara \ + && mkdir -p /etc/sahara /home/sahara \ && cp -r /sahara/etc/sahara/* /etc/sahara/ \ - && chown -R sahara: /etc/sahara /var/log/sahara /home/sahara \ + && chown -R sahara: /etc/sahara /home/sahara \ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/sahara/rootwrap.conf {% endif %} |