Merge "Provide multipath.conf to containers that need it"

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:

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

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

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:

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