From 326327acbaeb30ddfab34148ffcb9c3f64485deb Mon Sep 17 00:00:00 2001 From: Waldemar Znoinski Date: Sun, 18 Sep 2016 09:15:22 +0000 Subject: fix ironic-inspector setup * add ironic-inspector(-archive) source to docker image * pip install from above source code * move in-container config files to /etc/ironic-inspector * add sudoers file to allow ironic-rootwrap * copy rootwrap conf and filters from source repo Change-Id: Ie3cce19810b9940d06bb636b28015160fea6ddfb Closes-bug: #1624457 Closes-bug: #1624833 Closes-bug: #1624845 --- docker/ironic/ironic-inspector/Dockerfile.j2 | 14 ++++++++++++-- docker/ironic/ironic-inspector/ironic_sudoers | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 docker/ironic/ironic-inspector/ironic_sudoers (limited to 'docker') 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 * -- cgit v1.2.3