openstack/kolla
Code Issues Proposed changes

Add ironic sudoers file to binary packages as well

Browse Source 
When built as binary packages Ironic conductor would
fail to start due to a new 'sudo modprobe iscsi_tcp' command
added in 05c0d6998b

Change-Id: I74ebbc2ec612e1068ac82225dc79e9ee0b6c23f4
Closes-bug: #1676466
This commit is contained in:
Dan Prince 2017-03-27 10:48:19 -04:00
parent 464ca08bfe
commit 8b101b28a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -31,12 +31,12 @@ RUN ln -s ironic-base-source/* ironic \
&& chown -R ironic: /etc/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 && 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 ADD ironic_sudoers /etc/sudoers.d/kolla_ironic_sudoers
RUN chmod 750 /etc/sudoers.d \ RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_ironic_sudoers && chmod 440 /etc/sudoers.d/kolla_ironic_sudoers
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN touch /usr/local/bin/kolla_ironic_extend_start \ RUN touch /usr/local/bin/kolla_ironic_extend_start \