openstack/kolla
Code Issues Proposed changes

Load iscsi_tcp module when starting ironic-conductor

Browse Source 
ironic-conductor depends on iscsi_tcp module

Change-Id: I1dd7d1a8cd67bbdfc1262b39aa96997c12681900
Closes-Bug: #1672245
This commit is contained in:
Jeffrey Zhang 2017-03-13 11:31:02 +08:00
parent 8d37c9fe35
commit 05c0d6998b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ironic/ironic-base/ironic_sudoers
View File

@ -1 +1 @@
ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf * ironic ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-rootwrap /etc/ironic/rootwrap.conf *, /usr/sbin/modprobe iscsi_tcp, /sbin/modprobe iscsi_tcp

3
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -89,6 +89,9 @@ RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_pack
{{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }} {{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start
{% block ironic_conductor_footer %}{% endblock %} {% block ironic_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}

3
docker/ironic/ironic-conductor/extend_start.sh Normal file
View File

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