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).

NB: cherry-pick non-clean due to missing:
* docker/services/pacemaker/notify-rabbitmq.yaml
* docker/services/pacemaker/rpc-rabbitmq.yaml

Change-Id: Icc4b6c0b4139ed80ae45be97a789176ca15520d5
Suggested-by: Alex Schultz <aschultz@redhat.com>
(cherry picked from commit 62ea11d84f)
This commit is contained in:
Michele Baldessari 2019-09-20 16:10:32 +02:00 committed by yatin
parent 7c93dab6ab
commit be05427336
8 changed files with 16 additions and 8 deletions

View File

@ -169,7 +169,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:

View File

@ -154,7 +154,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:

View File

@ -249,7 +249,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:

View File

@ -209,7 +209,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:

View File

@ -225,7 +225,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:

View File

@ -148,7 +148,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:

View File

@ -142,7 +142,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:

View File

@ -197,7 +197,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: