diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-07 19:38:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-07 19:38:01 +0000 |
| commit | 314e417428ebcd3104ff5060906dbdaa81e8f31c (patch) | |
| tree | 4caa4a3af21d3566ed82fffacaacaf8e48cdf6b0 | |
| parent | cce6157c60d518712aa90586ef4ec0bd0659b5ca (diff) | |
| parent | b4a7bcae624e554e7ae982699dbf3ee5acb25457 (diff) | |
| download | kolla-314e417428ebcd3104ff5060906dbdaa81e8f31c.tar.gz kolla-314e417428ebcd3104ff5060906dbdaa81e8f31c.zip | |
Merge "Do not load iscsi_tcp from within a container."
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/extend_start.sh | 3 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/iscsi_tcp_sudoers | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index c094835a2..d81204e7b 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -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 %} diff --git a/docker/ironic/ironic-conductor/extend_start.sh b/docker/ironic/ironic-conductor/extend_start.sh deleted file mode 100644 index e058fad54..000000000 --- a/docker/ironic/ironic-conductor/extend_start.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -sudo modprobe iscsi_tcp diff --git a/docker/ironic/ironic-conductor/iscsi_tcp_sudoers b/docker/ironic/ironic-conductor/iscsi_tcp_sudoers deleted file mode 100644 index 5d38ac691..000000000 --- a/docker/ironic/ironic-conductor/iscsi_tcp_sudoers +++ /dev/null @@ -1 +0,0 @@ -ironic ALL=(root) NOPASSWD: /usr/sbin/modprobe iscsi_tcp, /sbin/modprobe iscsi_tcp |