diff options
| author | Zuul <zuul@review.openstack.org> | 2018-11-07 19:38:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-11-07 19:38:03 +0000 |
| commit | 87e293df1feaecc0f8d8676c34537b05bd929ff1 (patch) | |
| tree | 69723acb389575b6641e82927db950fb847c45e4 | |
| parent | 3e1619da6fe3ed439b9e6ea0a892bb41a5d4b335 (diff) | |
| parent | 74d8e65040ce007f18bf4ab518b454e288e4b699 (diff) | |
| download | kolla-87e293df1feaecc0f8d8676c34537b05bd929ff1.tar.gz kolla-87e293df1feaecc0f8d8676c34537b05bd929ff1.zip | |
Merge "Do not load dm-multipath module from the container"
| -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. |