diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-06 19:18:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-06 19:18:10 +0000 |
| commit | 5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297 (patch) | |
| tree | c769916ed3d7e0b8216ad65da7a9474a79a05ffc /docker/nova | |
| parent | a459a29433d6fb274843ce43dd3b5719bf419c5d (diff) | |
| parent | 3f79e37d21f7bda40656da2d9607cb4fe0c2c69a (diff) | |
| download | kolla-5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297.tar.gz kolla-5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297.zip | |
Merge "Fix the overwrite sudoers file issue"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index f0d18e3d7..ff25dcfe5 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -54,9 +54,9 @@ RUN ln -s nova-base-source/* nova \ && chown -R nova: /etc/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 +COPY nova_sudoers /etc/sudoers.d/kolla_nova_sudoers RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/nova_sudoers + && chmod 440 /etc/sudoers.d/kolla_nova_sudoers {% endif %} |