diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-03-13 11:31:02 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-03-14 11:17:45 +0800 |
| commit | 05c0d6998bdda155c925d563b75ac353303f93ff (patch) | |
| tree | 12af538978a49142a8e73452d358c205433922be /docker | |
| parent | 8d37c9fe3500627684225a00aa8a94446c78eec3 (diff) | |
| download | kolla-05c0d6998bdda155c925d563b75ac353303f93ff.tar.gz kolla-05c0d6998bdda155c925d563b75ac353303f93ff.zip | |
Load iscsi_tcp module when starting ironic-conductor
ironic-conductor depends on iscsi_tcp module
Change-Id: I1dd7d1a8cd67bbdfc1262b39aa96997c12681900
Closes-Bug: #1672245
Diffstat (limited to 'docker')
| -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 |