From ba1d9e9d4b0566f394ef227f9d7e9610e6afbbd6 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 30 Nov 2022 10:39:12 +0000 Subject: [PATCH] Tidy definition of http dir for inspector The directory for the tftp server defined consistently between ironic and inspector, but not for the http directory. This patch makes the definition of the http directory work the same way as the tftp one. Change-Id: I8d893faa31e5858c4923cb12ef453ec9397db5df --- defaults/main.yml | 2 +- tasks/ironic_inspector_post_install.yml | 2 +- templates/ironic-ipxe.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f439cd3c..f5bc3884 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -420,7 +420,7 @@ ironic_inspector_dhcp_lease_time: 600 ironic_inspector_dhcp_type: dnsmasq # isc_dhcp ironic_inspector_boot_mode: http #tftp ironic_inspector_pxe_boot_mode: "{{ ironic_inspector_boot_mode }}" -ironic_inspector_httpboot_dir: /httpboot +ironic_inspector_httpboot_dir: "{{ ironic_http_root }}" ironic_inspector_tftpboot_dir: "{{ ironic_tftpd_root }}" ironic_inspector_dhcp_interface: "{{ ironic_bmaas_interface }}" diff --git a/tasks/ironic_inspector_post_install.yml b/tasks/ironic_inspector_post_install.yml index df7f048b..be2d2aba 100644 --- a/tasks/ironic_inspector_post_install.yml +++ b/tasks/ironic_inspector_post_install.yml @@ -28,7 +28,7 @@ - name: Download IPA Images get_url: url: "{{ item.url }}" - dest: "/httpboot/{{ item.name }}" + dest: "{{ ironic_inspector_httpboot_dir }}/{{ item.name }}" checksum: "sha256:{{ item.sha_url }}" owner: "{{ ironic_system_user_name }}" group: "{{ ironic_system_group_name }}" diff --git a/templates/ironic-ipxe.conf.j2 b/templates/ironic-ipxe.conf.j2 index 27f416b6..99d5f993 100644 --- a/templates/ironic-ipxe.conf.j2 +++ b/templates/ironic-ipxe.conf.j2 @@ -10,7 +10,7 @@ server { # directory to store ipxe location / { - root /httpboot; + root {{ ironic_http_root }}; autoindex off; expires 1h; }