Bind mount directories that contain the key/certs for keystone

[apex-tripleo-heat-templates.git] / docker / services / ironic-pxe.yaml

diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index 2550519..51538e7 100644 (file)
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -40,10 +40,6 @@ outputs:
       step_config: &step_config ''
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
-      docker_image: &ironic_pxe_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
       puppet_config:
         config_volume: ironic
         puppet_tags: ironic_config
@@ -53,67 +49,37 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_pxe_http.json:
-           command: /usr/sbin/httpd -DFOREGROUND
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           - dest: /etc/httpd/conf.d/10-ipxe_vhost.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf.d/10-ipxe_vhost.conf
-           - dest: /etc/httpd/conf/httpd.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/httpd.conf
-           - dest: /etc/httpd/conf/ports.conf
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/etc/httpd/conf/ports.conf
-         /var/lib/kolla/config_files/ironic_pxe_tftp.json:
-           command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
-           - dest: /var/lib/ironic/tftpboot/chain.c32
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/chain.c32
-           - dest: /var/lib/ironic/tftpboot/pxelinux.0
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/pxelinux.0
-           - dest: /var/lib/ironic/tftpboot/ipxe.efi
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/ipxe.efi
-           - dest: /var/lib/ironic/tftpboot/undionly.kpxe
-             owner: ironic
-             perm: '0744'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/undionly.kpxe
-           - dest: /var/lib/ironic/tftpboot/map-file
-             owner: root
-             perm: '0644'
-             source: /var/lib/kolla/config_files/src/var/lib/ironic/tftpboot/map-file
+        /var/lib/kolla/config_files/ironic_pxe_http.json:
+          command: /usr/sbin/httpd -DFOREGROUND
+        /var/lib/kolla/config_files/ironic_pxe_tftp.json:
+          command: /usr/sbin/in.tftpd --foreground --user root --address 0.0.0.0:69 --map-file /var/lib/ironic/tftpboot/map-file /var/lib/ironic/tftpboot
       docker_config:
         step_4:
           ironic_pxe_tftp:
             start_order: 90
-            image: *ironic_pxe_image
+            image: &ironic_pxe_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
             net: host
             privileged: false
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_pxe_tftp.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+              # TODO(mandre) check how docker like mounting in a bind-mounted tree
+              # This directory may contain migrated data from BM
+              - /var/lib/ironic:/var/lib/ironic/
+              # These files were generated by puppet inside the config container
+              # TODO(mandre) check the mount permission (ro/rw)
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/chain.c32:/var/lib/ironic/tftpboot/chain.c32
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/pxelinux.0:/var/lib/ironic/tftpboot/pxelinux.0
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/ipxe.efi:/var/lib/ironic/tftpboot/ipxe.efi
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/undionly.kpxe:/var/lib/ironic/tftpboot/undionly.kpxe
+              - /var/lib/config-data/ironic/var/lib/ironic/tftpboot/map-file:/var/lib/ironic/tftpboot/map-file
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
               - /dev/log:/dev/log
-              - ironic:/var/lib/ironic/
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           ironic_pxe_http:
@@ -124,10 +90,15 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/ironic_pxe_http.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
-              - /var/lib/config-data/ironic/etc/httpd/conf.modules.d:/etc/httpd/conf.modules.d:ro
+              - /var/lib/config-data/ironic/etc/ironic/:/etc/ironic/:ro
+              - /var/lib/config-data/ironic/etc/httpd/:/etc/httpd/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-              - ironic:/var/lib/ironic/
+              - /var/lib/ironic:/var/lib/ironic/
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create ironic persistent data directory
+          file:
+            path: /var/lib/ironic
+            state: directory