From 05c0d6998bdda155c925d563b75ac353303f93ff Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 13 Mar 2017 11:31:02 +0800 Subject: [PATCH] Load iscsi_tcp module when starting ironic-conductor ironic-conductor depends on iscsi_tcp module Change-Id: I1dd7d1a8cd67bbdfc1262b39aa96997c12681900 Closes-Bug: #1672245 --- docker/ironic/ironic-base/ironic_sudoers | 2 +- docker/ironic/ironic-conductor/Dockerfile.j2 | 3 +++ docker/ironic/ironic-conductor/extend_start.sh | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 docker/ironic/ironic-conductor/extend_start.sh diff --git a/docker/ironic/ironic-base/ironic_sudoers b/docker/ironic/ironic-base/ironic_sudoers index 3e7c843f39..573aa21948 100644 --- a/docker/ironic/ironic-base/ironic_sudoers +++ b/docker/ironic/ironic-base/ironic_sudoers @@ -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 diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index c7fbdbc52f..06827258f5 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -89,6 +89,9 @@ 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 +RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start + {% block ironic_conductor_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-conductor/extend_start.sh b/docker/ironic/ironic-conductor/extend_start.sh new file mode 100644 index 0000000000..e058fad549 --- /dev/null +++ b/docker/ironic/ironic-conductor/extend_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo modprobe iscsi_tcp