diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 18f26b89f3..e623d8745d 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/deployment/cinder/cinder-common-container-puppet.yaml @@ -172,6 +172,7 @@ outputs: if: - multipathd_enabled - - /etc/multipath:/etc/multipath:z + - /etc/multipath.conf:/etc/multipath.conf:ro - [] cinder_volume_environment: diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 8f95302a02..9584c7db95 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -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 diff --git a/deployment/multipathd/multipathd-container.yaml b/deployment/multipathd/multipathd-container.yaml index dabcb89e5c..beaf1727b9 100644 --- a/deployment/multipathd/multipathd-container.yaml +++ b/deployment/multipathd/multipathd-container.yaml @@ -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 diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 709ece248a..8840c758be 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -705,6 +705,7 @@ outputs: if: - {equals: [{get_param: MultipathdEnable}, true]} - - /etc/multipath:/etc/multipath:z + - /etc/multipath.conf:/etc/multipath.conf:ro - [] environment: list_concat: diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 18cf460585..acb3cd73ff 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -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