diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-18 09:49:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-18 09:49:16 +0000 |
| commit | 5a03d35a81d6db66267e9d0c0d1b8ade8bd4be13 (patch) | |
| tree | 10c865e7b57554afebb0de12d3dc9a3cebc597fc /docker | |
| parent | 98914c483ac5b377e04420bf8d314dee21453169 (diff) | |
| parent | b2eacd6306cd865d0d250a47d9751bf417018b83 (diff) | |
| download | kolla-5a03d35a81d6db66267e9d0c0d1b8ade8bd4be13.tar.gz kolla-5a03d35a81d6db66267e9d0c0d1b8ade8bd4be13.zip | |
Merge "Fix designate dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/designate/designate-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 6e6c2d589..91b7122d5 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -42,10 +42,10 @@ RUN cp /etc/designate/policy.json /tmp/ \ ADD designate-base-archive /designate-base-source RUN ln -s designate-base-source/* designate \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /designate \ - && mkdir -p /etc/designate /var/log/designate \ + && mkdir -p /etc/designate \ && cp -r /designate/etc/designate/* /etc/designate/ \ && mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \ - && chown -R designate: /etc/designate /var/log/designate \ + && chown -R designate: /etc/designate \ && 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/designate/rootwrap.conf {% endif %} |