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
(cherry picked from commit 1f868ba530)
This commit is contained in:
Cédric Jeanneret 2021-11-29 14:56:14 +01:00 committed by Cedric Jeanneret
parent d48e51e94a
commit 0261ea22ae
5 changed files with 6 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -97,7 +97,7 @@ outputs:
-
- /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