Merge "Tidy definition of http dir for inspector"

defaults/main.yml

@@ -436,7 +436,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 }}"

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 }}"

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;
   }