Stop bindmounting /usr/bin
With the backport of dumb-init to rocky/queens via I995477e1363fbf6cae2bdf1c146b841e8c84524b some HA containers will fail because they bind mount /usr/bin in order to run docker commands from a container. Let's just bind-mount the docker binary (and its docker-current counterpard instead). Change-Id: Icc4b6c0b4139ed80ae45be97a789176ca15520d5 Suggested-by: Alex Schultz <aschultz@redhat.com>
This commit is contained in:
parent
aaf980cb28
commit
62ea11d84f
|
@ -176,7 +176,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_3:
|
||||
cinder_backup_init_logs:
|
||||
|
|
|
@ -161,7 +161,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_3:
|
||||
cinder_volume_init_logs:
|
||||
|
|
|
@ -244,7 +244,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_2:
|
||||
mysql_restart_bundle:
|
||||
|
|
|
@ -204,7 +204,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_2:
|
||||
map_merge:
|
||||
|
|
|
@ -227,7 +227,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
image: {get_param: DockerHAProxyImage}
|
||||
step_2:
|
||||
|
|
|
@ -143,7 +143,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_3:
|
||||
manila_share_init_logs:
|
||||
|
|
|
@ -193,7 +193,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_2:
|
||||
rabbitmq_restart_bundle:
|
||||
|
|
|
@ -137,7 +137,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_3:
|
||||
ovn_dbs_restart_bundle:
|
||||
|
|
|
@ -192,7 +192,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_2:
|
||||
rabbitmq_restart_bundle:
|
||||
|
|
|
@ -193,7 +193,8 @@ outputs:
|
|||
- /etc/localtime:/etc/localtime:ro
|
||||
- /dev/shm:/dev/shm:rw
|
||||
- /etc/sysconfig/docker:/etc/sysconfig/docker:ro
|
||||
- /usr/bin:/usr/bin:ro
|
||||
- /usr/bin/docker:/usr/bin/docker:ro
|
||||
- /usr/bin/docker-current:/usr/bin/docker-current:ro
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
step_2:
|
||||
rabbitmq_restart_bundle:
|
||||
|
|
Loading…
Reference in New Issue