From e5a071dbc8577f6446335ae70e8cca9c76ad0bc8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 16 Jun 2022 11:45:17 +0900 Subject: [PATCH] ironic: Remove tasks for image migration This removes the tasks to copy image data from /(http|tftp)root to /var/lib/ironic/(http|tftp)root. These tasks were implemented to migrate image data from the old paths we used before containerizing undercloud and now all image files should be created in the new paths by the overcloud image command. Change-Id: If47d88e526ead2a9fdf1610f19303898d6847472 --- .../ironic-conductor-container-puppet.yaml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 379b293794..b9a77743a0 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -718,27 +718,6 @@ outputs: params: $IRONIC_PASSWORD: {get_param: IronicPassword} when: is_json_rpc_with_http_basic | bool - - name: stat /httpboot - stat: path=/httpboot - register: stat_httpboot - - name: stat /tftpboot - stat: path=/tftpboot - register: stat_tftpboot - - name: stat /var/lib/ironic/httpboot - stat: path=/var/lib/ironic/httpboot - register: stat_ironic_httpboot - - name: stat /var/lib/ironic/tftpboot - stat: path=/var/lib/ironic/tftpboot - register: stat_ironic_tftpboot - # cannot use 'copy' module as with 'remote_src' it doesn't support recursion - - name: migrate /httpboot to containerized (if applicable) - command: /bin/cp -R /httpboot /var/lib/ironic/httpboot - when: stat_httpboot.stat.exists and not stat_ironic_httpboot.stat.exists - - name: migrate /tftpboot to containerized (if applicable) - command: /bin/cp -R /tftpboot /var/lib/ironic/tftpboot - when: stat_tftpboot.stat.exists and not stat_ironic_tftpboot.stat.exists - # Even if there was nothing to copy from original locations, - # we need to create the dirs before starting the containers - name: ensure ironic pxe directories exist file: path: /var/lib/ironic/{{ item }}