Merge "Do not load iscsi_tcp from within a container."

This commit is contained in:
Zuul 2018-11-07 19:38:01 +00:00 committed by Gerrit Code Review
commit 314e417428
3 changed files with 0 additions and 9 deletions

View File

@ -103,11 +103,6 @@ RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_pack
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
COPY iscsi_tcp_sudoers /etc/sudoers.d/kolla_iscsi_tcp_sudoers
RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start \
&& chmod 440 /etc/sudoers.d/kolla_iscsi_tcp_sudoers
{% block ironic_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}

View File

@ -1,3 +0,0 @@
#!/bin/bash
sudo modprobe iscsi_tcp

View File

@ -1 +0,0 @@
ironic ALL=(root) NOPASSWD: /usr/sbin/modprobe iscsi_tcp, /sbin/modprobe iscsi_tcp