From 1f868ba5307adb6962d89c99b8570c2c09536695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= <cjeanner@redhat.com>
Date: Mon, 29 Nov 2021 14:56:14 +0100
Subject: [PATCH] Ensure we bind-mount /dev instead of /dev/

With the move to crun instead of runc for the container engine, we seem
to hit a known issue that was corrected back in 2015[1] for runc. There
was then a regression, fixed with [2] a bit later.

There's a good chance crun has a partial fix only, matching only /dev
and not /dev/, leading to the change of /dev/ptmx from an actual node to
a symlink pointing to /dev/pts/ptmx.

Another fix might be ensuring we don't have any trailing "/" in the
volume paths passed to the tripleo-ansible/tripleo_container_manage
module/role.

[1] https://github.com/opencontainers/runc/pull/96
[2] https://github.com/opencontainers/runc/pull/742/files

Closes-Bug: #1950176

Change-Id: I094120f7f2f6bfcfc0cc5843aa1b23629cd90a23
---
 deployment/cinder/cinder-common-container-puppet.yaml   | 4 ++--
 deployment/deprecated/multipathd-container.yaml         | 2 +-
 deployment/iscsid/iscsid-container-puppet.yaml          | 2 +-
 deployment/manila/manila-share-common.yaml              | 2 +-
 deployment/multipathd/multipathd-container-ansible.yaml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml
index da4db817ba..8efcc6657b 100644
--- a/deployment/cinder/cinder-common-container-puppet.yaml
+++ b/deployment/cinder/cinder-common-container-puppet.yaml
@@ -357,7 +357,7 @@ outputs:
             - - '/var/lib/kolla/config_files/src-ceph'
             - - 'ro'
           - /lib/modules:/lib/modules:ro
-          - /dev/:/dev/
+          - /dev:/dev
           - /run/:/run/
           - /sys:/sys
           - /var/lib/cinder:/var/lib/cinder:z
@@ -403,7 +403,7 @@ outputs:
             - - {get_param: CephConfigPath}
             - - '/var/lib/kolla/config_files/src-ceph'
             - - 'ro'
-          - /dev/:/dev/
+          - /dev:/dev
           - /run/:/run/
           - /sys:/sys
           - /lib/modules:/lib/modules:ro
diff --git a/deployment/deprecated/multipathd-container.yaml b/deployment/deprecated/multipathd-container.yaml
index bb29e59474..56367b0792 100644
--- a/deployment/deprecated/multipathd-container.yaml
+++ b/deployment/deprecated/multipathd-container.yaml
@@ -122,7 +122,7 @@ outputs:
                   - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/multipathd:/var/lib/kolla/config_files/src:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
-                  - /dev/:/dev/
+                  - /dev:/dev
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml
index 6792acf3d6..147cc2a390 100644
--- a/deployment/iscsid/iscsid-container-puppet.yaml
+++ b/deployment/iscsid/iscsid-container-puppet.yaml
@@ -142,7 +142,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 - - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro
-                  - /dev/:/dev/
+                  - /dev:/dev
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml
index 8d28ff4791..6b1007f2ba 100644
--- a/deployment/manila/manila-share-common.yaml
+++ b/deployment/manila/manila-share-common.yaml
@@ -61,7 +61,7 @@ outputs:
             - - {get_param: CephConfigPath}
             - - '/var/lib/kolla/config_files/src-ceph'
             - - 'ro'
-          - /dev/:/dev/
+          - /dev:/dev
           - /run/:/run/
           - /sys:/sys
           - /lib/modules:/lib/modules:ro
diff --git a/deployment/multipathd/multipathd-container-ansible.yaml b/deployment/multipathd/multipathd-container-ansible.yaml
index 9ecc440836..fa2d82e094 100644
--- a/deployment/multipathd/multipathd-container-ansible.yaml
+++ b/deployment/multipathd/multipathd-container-ansible.yaml
@@ -96,7 +96,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 - - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
-                  - /dev/:/dev/
+                  - /dev:/dev
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro