diff options
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/nova/nova-base/extend_start.sh | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index cb21e1aaf..abf8050b4 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -44,9 +44,9 @@ ADD nova-base-archive /nova-base-source RUN ln -s nova-base-source/* nova \ && useradd --user-group nova \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /nova \ - && mkdir -p /etc/nova /var/log/nova /home/nova /var/lib/nova \ + && mkdir -p /etc/nova /home/nova /var/lib/nova \ && cp -r /nova/etc/nova/* /etc/nova/ \ - && chown -R nova: /etc/nova /var/log/nova /home/nova /var/lib/nova \ + && chown -R nova: /etc/nova /home/nova /var/lib/nova \ && 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/nova/rootwrap.conf COPY nova_sudoers /etc/sudoers.d/nova_sudoers @@ -55,4 +55,7 @@ RUN chmod 750 /etc/sudoers.d \ {% 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 nova diff --git a/docker/nova/nova-base/extend_start.sh b/docker/nova/nova-base/extend_start.sh new file mode 100644 index 000000000..11b4b95d6 --- /dev/null +++ b/docker/nova/nova-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/nova" ]]; then + mkdir -p /var/log/kolla/nova +fi +if [[ $(stat -c %a /var/log/kolla/nova) != "755" ]]; then + chmod 755 /var/log/kolla/nova +fi |