diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-26 11:22:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-26 11:22:08 +0000 |
| commit | de2437ed4c0eec3459dea1edb6457a54008a0656 (patch) | |
| tree | 5f83f1eb6a985a31a9846e4752c50c60a8ba5c5e /docker | |
| parent | 6f5c9e5fa17fb523c5305f6729e86133c0e936b7 (diff) | |
| parent | 326327acbaeb30ddfab34148ffcb9c3f64485deb (diff) | |
| download | kolla-de2437ed4c0eec3459dea1edb6457a54008a0656.tar.gz kolla-de2437ed4c0eec3459dea1edb6457a54008a0656.zip | |
Merge "fix ironic-inspector setup"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/ironic_sudoers | 1 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 862b946d8..2f51273f7 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -15,10 +15,20 @@ MAINTAINER {{ maintainer }} {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} {% elif install_type == 'source' %} -RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \ - ironic-inspector +ADD ironic-inspector-archive /ironic-inspector-source +RUN ln -s ironic-inspector-source/* ironic-inspector \ + && mv /etc/ironic /etc/ironic-inspector \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ironic-inspector \ + && cp /ironic-inspector/rootwrap.conf /etc/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 + {% endif %} +COPY ironic_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers +RUN chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers + {% block ironic_inspector_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/ironic/ironic-inspector/ironic_sudoers b/docker/ironic/ironic-inspector/ironic_sudoers new file mode 100644 index 000000000..612f8dc3a --- /dev/null +++ b/docker/ironic/ironic-inspector/ironic_sudoers @@ -0,0 +1 @@ +ironic ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf * |