Fix containerized ironic bind-mounts

We obvserve errors "DriverLoadError: Driver, hardware type or interface ilo-pxe could not be loaded" as it uses the host level access to /var/lib/ironic, which is owned by root. When we have the host/container(s) shared access to a bind mounted dir, it needs to be shared instead of the default private mode. Additionally, fix the missing /var/lib/ironic ownership change in the ironix-pxe's kolla config. Related-bug: #1782267 Change-Id: I5ad4956174346f024945852da09f3841c3378c2b Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
openstack-archive · Jul 20, 2018 · 90a7a22 · 90a7a22
1 parent a9fda38
commit 90a7a22
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
@@ -169,7 +169,7 @@ outputs:
                       - /sys:/sys
                       - /dev:/dev
                       - /run:/run #shared?
-                      - /var/lib/ironic:/var/lib/ironic
+                      - /var/lib/ironic:/var/lib/ironic:shared
                       - /var/log/containers/ironic:/var/log/ironic
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS

diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml
@@ -89,8 +89,8 @@ outputs:
               - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerIronicInspectorConfigImage}
         volumes:
-          - /var/lib/ironic:/var/lib/ironic
-          - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir
+          - /var/lib/ironic:/var/lib/ironic:shared
+          - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared
       kolla_config:
         /var/lib/kolla/config_files/ironic_inspector.json:
           command: /usr/bin/ironic-inspector --config-file /etc/ironic-inspector/inspector-dist.conf --config-file /etc/ironic-inspector/inspector.conf
@@ -131,7 +131,7 @@ outputs:
             image: *ironic_inspector_image
             user: root
             volumes:
-            - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir
+            - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared
             command: ['/bin/bash', '-c', 'chown -R ironic-inspector:ironic-inspector /var/lib/ironic-inspector/dhcp-hostsdir']
           ironic_inspector_db_sync:
             start_order: 2
@@ -162,7 +162,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_inspector.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/ironic:/var/lib/ironic
+                  - /var/lib/ironic:/var/lib/ironic:shared
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             command:
@@ -188,9 +188,9 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/ironic_inspector.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/ironic:/var/lib/ironic
+                  - /var/lib/ironic:/var/lib/ironic:shared
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector
-                  - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir
+                  - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           ironic_inspector_dnsmasq:
@@ -207,7 +207,7 @@ outputs:
                   - /var/lib/kolla/config_files/ironic_inspector_dnsmasq.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ironic_inspector/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector
-                  - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir
+                  - /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:shared
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:

diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
@@ -73,6 +73,9 @@ outputs:
             - path: /var/log/ironic
               owner: ironic:ironic
               recurse: true
+            - path: /var/lib/ironic
+              owner: ironic:ironic
+              recurse: true
       docker_config:
         step_4:
           ironic_pxe_tftp:
@@ -90,7 +93,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/ironic:/var/lib/ironic/
+                  - /var/lib/ironic:/var/lib/ironic/:shared
                   - /dev/log:/dev/log
                   - /var/log/containers/ironic:/var/log/ironic
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd
@@ -108,7 +111,7 @@ outputs:
                 -
                   - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
-                  - /var/lib/ironic:/var/lib/ironic/
+                  - /var/lib/ironic:/var/lib/ironic/:shared
                   - /var/log/containers/ironic:/var/log/ironic
                   - /var/log/containers/httpd/ironic-pxe:/var/log/httpd
             environment: