diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-26 02:39:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-26 02:39:45 +0000 |
| commit | 387678b7b1f949fb0c27456fc4bd5e296fbe96fa (patch) | |
| tree | 343748f8500a7c370bf00459f25c29a5ae7501e3 | |
| parent | 4a630d5dae628d4c42ac84b098723f079101660f (diff) | |
| parent | 5752c7eb0b1f9c5978dd4e9271ded346cea231e0 (diff) | |
| download | kolla-387678b7b1f949fb0c27456fc4bd5e296fbe96fa.tar.gz kolla-387678b7b1f949fb0c27456fc4bd5e296fbe96fa.zip | |
Merge "Fix binary ironic-inspector rootwrap configuration"
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/ironic_sudoers_binary | 1 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/ironic_sudoers_source (renamed from docker/ironic/ironic-inspector/ironic_sudoers) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 491531ba4..8adf9dfe7 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -17,6 +17,8 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} +COPY ironic_sudoers_binary /etc/sudoers.d/kolla_ironic_inspector_sudoers + {% elif install_type == 'source' %} {% if base_distro in ['ubuntu'] %} {% set ironic_inspector_packages = ['iptables'] %} @@ -37,9 +39,10 @@ RUN ln -s ironic-inspector-source/* ironic-inspector \ && cp -r /ironic-inspector/rootwrap.d/ /etc/ironic-inspector/ \ && 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/ironic-inspector/rootwrap.conf +COPY ironic_sudoers_source /etc/sudoers.d/kolla_ironic_inspector_sudoers + {% endif %} -COPY ironic_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start RUN chmod 750 /etc/sudoers.d \ diff --git a/docker/ironic/ironic-inspector/ironic_sudoers_binary b/docker/ironic/ironic-inspector/ironic_sudoers_binary new file mode 100644 index 000000000..d1e0ef68d --- /dev/null +++ b/docker/ironic/ironic-inspector/ironic_sudoers_binary @@ -0,0 +1 @@ +ironic ALL=(root) NOPASSWD: /usr/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf * diff --git a/docker/ironic/ironic-inspector/ironic_sudoers b/docker/ironic/ironic-inspector/ironic_sudoers_source index 612f8dc3a..612f8dc3a 100644 --- a/docker/ironic/ironic-inspector/ironic_sudoers +++ b/docker/ironic/ironic-inspector/ironic_sudoers_source |