Merge "Bind mount /var/lib/iscsi in containers using iSCSI"

deployment/glance/glance-api-container-puppet.yaml

@@ -468,6 +468,7 @@ outputs:
                     - cinder_backend_enabled
                     - - /dev:/dev
                       - /etc/iscsi:/etc/iscsi
+                      - /var/lib/iscsi:/var/lib/iscsi:z
                     - []
             environment:
               - KOLLA_BOOTSTRAP=True

docker/services/cinder-common.yaml

@@ -152,8 +152,9 @@ outputs:
           - /dev/:/dev/
           - /run/:/run/
           - /sys:/sys
-          - /var/lib/cinder:/var/lib/cinder
-          - /var/log/containers/cinder:/var/log/cinder
+          - /var/lib/cinder:/var/lib/cinder:z
+          - /var/lib/iscsi:/var/lib/iscsi:z
+          - /var/log/containers/cinder:/var/log/cinder:z
 
   cinder_volume_environment:
     description: Docker environment for the cinder-volume container (HA or non-HA)
@@ -182,6 +183,7 @@ outputs:
           - /sys:/sys
           - /lib/modules:/lib/modules:ro
           - /var/lib/cinder:/var/lib/cinder:z
+          - /var/lib/iscsi:/var/lib/iscsi:z
           - /var/log/containers/cinder:/var/log/cinder:z
 
   cinder_backup_environment:

docker/services/iscsid.yaml

@@ -100,6 +100,7 @@ outputs:
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
+                  - /var/lib/iscsi:/var/lib/iscsi:z
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/multipathd.yaml

@@ -83,7 +83,8 @@ outputs:
                   - /run/:/run/
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
-                  - /var/lib/cinder:/var/lib/cinder
+                  - /var/lib/cinder:/var/lib/cinder:z
+                  - /var/lib/iscsi:/var/lib/iscsi:z
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

docker/services/nova-compute.yaml

@@ -234,6 +234,7 @@ outputs:
                   - /dev:/dev
                   - /lib/modules:/lib/modules:ro
                   - /run:/run
+                  - /var/lib/iscsi:/var/lib/iscsi:z
                   - /var/lib/nova:/var/lib/nova:shared,z
                   - /var/lib/libvirt:/var/lib/libvirt:shared,z
                   - /sys/class/net:/sys/class/net

docker/services/nova-ironic.yaml

@@ -141,6 +141,7 @@ outputs:
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /run:/run
                   - /dev:/dev
+                  - /var/lib/iscsi:/var/lib/iscsi:z
                   - /var/lib/nova/:/var/lib/nova:shared,z
                   - /var/log/containers/nova:/var/log/nova:z
             environment: