diff options
| author | Cédric Jeanneret <cjeanner@redhat.com> | 2018-09-26 17:09:59 +0200 |
|---|---|---|
| committer | Cédric Jeanneret <cjeanner@redhat.com> | 2018-11-07 16:42:53 +0100 |
| commit | 74d8e65040ce007f18bf4ab518b454e288e4b699 (patch) | |
| tree | ca7f034bbb0695b4a5b96786fc3b28896d890fcc | |
| parent | 6d405cc9ad4116833f38ec60a3cb82fa8f80689f (diff) | |
| download | kolla-74d8e65040ce007f18bf4ab518b454e288e4b699.tar.gz kolla-74d8e65040ce007f18bf4ab518b454e288e4b699.zip | |
Do not load dm-multipath module from the container
The module must be loaded from the host directly in order
to avoid any SELinux issues.
There are examples in kolla-ansible and tripleo-heat-templates:
- https://review.openstack.org/#/c/605624/
- https://review.openstack.org/#/c/605450/
Change-Id: Ieebb2564e816d83ec4111c211677f0a44488a224
Related-Bug: 1794550
| -rw-r--r-- | docker/multipathd/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/multipathd/extend_start.sh | 2 | ||||
| -rw-r--r-- | releasenotes/notes/do-not-load-modules-9b651e40d3479c39.yaml | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/docker/multipathd/Dockerfile.j2 b/docker/multipathd/Dockerfile.j2 index e2fcba2e5..60c8774c8 100644 --- a/docker/multipathd/Dockerfile.j2 +++ b/docker/multipathd/Dockerfile.j2 @@ -13,8 +13,5 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(multipathd_packages | customizable("packages")) }} -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - {% block multipathd_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/multipathd/extend_start.sh b/docker/multipathd/extend_start.sh deleted file mode 100644 index 42c145da3..000000000 --- a/docker/multipathd/extend_start.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -modprobe dm-multipath diff --git a/releasenotes/notes/do-not-load-modules-9b651e40d3479c39.yaml b/releasenotes/notes/do-not-load-modules-9b651e40d3479c39.yaml new file mode 100644 index 000000000..87c1ac0ae --- /dev/null +++ b/releasenotes/notes/do-not-load-modules-9b651e40d3479c39.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Remove kernel module loading from within containers. This must now be done + on the host directly. |