Merge "Ensure we bind-mount /dev instead of /dev/"

This commit is contained in:
Zuul 2021-11-30 19:33:37 +00:00 committed by Gerrit Code Review
commit bf9417699f
5 changed files with 6 additions and 6 deletions

View File

@ -357,7 +357,7 @@ outputs:
- - '/var/lib/kolla/config_files/src-ceph' - - '/var/lib/kolla/config_files/src-ceph'
- - 'ro' - - 'ro'
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /var/lib/cinder:/var/lib/cinder:z - /var/lib/cinder:/var/lib/cinder:z
@ -403,7 +403,7 @@ outputs:
- - {get_param: CephConfigPath} - - {get_param: CephConfigPath}
- - '/var/lib/kolla/config_files/src-ceph' - - '/var/lib/kolla/config_files/src-ceph'
- - 'ro' - - 'ro'
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /lib/modules:/lib/modules:ro - /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/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 - /var/lib/config-data/puppet-generated/multipathd:/var/lib/kolla/config_files/src:ro
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

View File

@ -142,7 +142,7 @@ outputs:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/kolla/config_files/iscsid.json:/var/lib/kolla/config_files/config.json:ro
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

View File

@ -61,7 +61,7 @@ outputs:
- - {get_param: CephConfigPath} - - {get_param: CephConfigPath}
- - '/var/lib/kolla/config_files/src-ceph' - - '/var/lib/kolla/config_files/src-ceph'
- - 'ro' - - 'ro'
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro

View File

@ -96,7 +96,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro - - /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 - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
- /dev/:/dev/ - /dev:/dev
- /run/:/run/ - /run/:/run/
- /sys:/sys - /sys:/sys
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro