diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-16 04:05:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-16 04:05:38 +0000 |
| commit | f33839b043ad3642e16f2d14a464eaaad8e47574 (patch) | |
| tree | 3b1ba79a018ca66f526b26de06f4c408bc529011 | |
| parent | cf6883b82b9b14a440aa748319430f6f424c2293 (diff) | |
| parent | 05c0d6998bdda155c925d563b75ac353303f93ff (diff) | |
| download | kolla-f33839b043ad3642e16f2d14a464eaaad8e47574.tar.gz kolla-f33839b043ad3642e16f2d14a464eaaad8e47574.zip | |
Merge "Load iscsi_tcp module when starting ironic-conductor"
| -rw-r--r-- | docker/ironic/ironic-base/ironic_sudoers | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/extend_start.sh | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/docker/ironic/ironic-base/ironic_sudoers b/docker/ironic/ironic-base/ironic_sudoers index 3e7c843f3..573aa2194 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 c7fbdbc52..06827258f 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 000000000..e058fad54 --- /dev/null +++ b/docker/ironic/ironic-conductor/extend_start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +sudo modprobe iscsi_tcp |