diff options
| author | SamYaple <sam@yaple.net> | 2016-02-03 05:12:13 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-06 06:48:59 +0000 |
| commit | 2514bcf0c3ce0f6637da26567ddb82588af58938 (patch) | |
| tree | ff7494de98920311f617790f9644f37604c0bdf4 /docker/ceilometer | |
| parent | e8d66766f0c3c06003220df8c436af191210a7dd (diff) | |
| download | kolla-2514bcf0c3ce0f6637da26567ddb82588af58938.tar.gz kolla-2514bcf0c3ce0f6637da26567ddb82588af58938.zip | |
Correct issue with virtualenv rootwrap
Because we use rootwrap in a venv we need to update the exec_dirs.
Without doing this *some* commands will break for various reasons that
I won't get into in this review in detail. But this is required for
neutron-l3-agent in a container + drop-root.
Change-Id: I1a09f7188fdd501b7ce251d9f2fb0e5b10222142
Partially-Implements: blueprint drop-root
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 3d34b370e..1d1965d9e 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -17,8 +17,9 @@ RUN ln -s ceilometer-base-source/* ceilometer \ && useradd --user-group ceilometer \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer \ && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \ - && cp -r /ceilometer/etc/* /etc/ceilometer/ \ - && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer + && cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \ + && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer \ + && 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/ceilometer/rootwrap.conf {% endif %} |