Merge "mistral-executor: bind mount the docker socket only when needed"
This commit is contained in:
commit
9eeaa43d0d
@ -156,7 +156,6 @@ outputs:
|
||||
- /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
|
||||
- /run:/run
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
- /var/log/containers/mistral:/var/log/mistral:z
|
||||
- /var/lib/mistral:/var/lib/mistral:z
|
||||
- /usr/share/ansible/:/usr/share/ansible/:ro
|
||||
@ -175,7 +174,7 @@ outputs:
|
||||
- 'ro'
|
||||
- if:
|
||||
- docker_enabled
|
||||
- null
|
||||
- - /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
# Required when pulling images from a registry during
|
||||
# Image Prepare workflow
|
||||
- - /var/lib/containers:/var/lib/containers:rw
|
||||
|
Loading…
Reference in New Issue
Block a user