Provide multipath.conf to containers that need it

With [1], /etc/multipath.conf is configured for use by the multipath
daemon running in its own container. However, other containerized
services (such as cinder-volume) execute commands that also require
access to multipath.conf. This patch adds a volume mount to each
container that needs access to the file.

[1] https://review.opendev.org/665456

Related-Bug: #1834042
Change-Id: If76c935b288013c858e7d3e477021210d319547a
This commit is contained in:
Alan Bishop 2019-07-24 10:27:26 -07:00
parent 8f1fb57ae0
commit 2fb2d1204c
5 changed files with 11 additions and 0 deletions

View File

@ -172,6 +172,7 @@ outputs:
if:
- multipathd_enabled
- - /etc/multipath:/etc/multipath:z
- /etc/multipath.conf:/etc/multipath.conf:ro
- []
cinder_volume_environment:

View File

@ -529,6 +529,7 @@ outputs:
if:
- cinder_multipathd_enabled
- - /etc/multipath:/etc/multipath:z
- /etc/multipath.conf:/etc/multipath.conf:ro
- []
environment:
- KOLLA_BOOTSTRAP=True

View File

@ -94,6 +94,8 @@ outputs:
- 'y'
- 'n'
config_image: {get_param: ContainerMultipathdConfigImage}
volumes:
- /etc/multipath.conf:/etc/multipath.conf:z
kolla_config:
/var/lib/kolla/config_files/multipathd.json:
command: /usr/sbin/multipathd -d
@ -153,6 +155,11 @@ outputs:
path: /etc/multipath
state: directory
setype: svirt_sandbox_file_t
- name: ensure /etc/multipath.conf exists
file:
path: /etc/multipath.conf
state: touch
setype: svirt_sandbox_file_t
upgrade_tasks: []
post_upgrade_tasks:
- when: step|int == 1

View File

@ -704,6 +704,7 @@ outputs:
if:
- {equals: [{get_param: MultipathdEnable}, true]}
- - /etc/multipath:/etc/multipath:z
- /etc/multipath.conf:/etc/multipath.conf:ro
- []
environment:
list_concat:

View File

@ -184,6 +184,7 @@ outputs:
if:
- {equals: [{get_param: MultipathdEnable}, true]}
- - /etc/multipath:/etc/multipath:z
- /etc/multipath.conf:/etc/multipath.conf:ro
- []
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS