From 8b101b28a1040fd6b4753c09364106274d7e6e09 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 27 Mar 2017 10:48:19 -0400 Subject: [PATCH] Add ironic sudoers file to binary packages as well When built as binary packages Ironic conductor would fail to start due to a new 'sudo modprobe iscsi_tcp' command added in 05c0d6998bdda155c925d563b75ac353303f93ff Change-Id: I74ebbc2ec612e1068ac82225dc79e9ee0b6c23f4 Closes-bug: #1676466 --- docker/ironic/ironic-base/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index e192aba48c..ddde46b80c 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -31,12 +31,12 @@ RUN ln -s ironic-base-source/* ironic \ && chown -R ironic: /etc/ironic \ && 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/rootwrap.conf +{% endif %} + ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_ironic_sudoers -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_ironic_extend_start \