openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "Tidy definition of http dir for inspector"

Browse Source
This commit is contained in:
Zuul 2022-12-09 12:44:51 +00:00 committed by Gerrit Code Review
commit 591399a999
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -436,7 +436,7 @@ ironic_inspector_dhcp_lease_time: 600
ironic_inspector_dhcp_type: dnsmasq # isc_dhcp ironic_inspector_dhcp_type: dnsmasq # isc_dhcp
ironic_inspector_boot_mode: http #tftp ironic_inspector_boot_mode: http #tftp
ironic_inspector_pxe_boot_mode: "{{ ironic_inspector_boot_mode }}" 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_tftpboot_dir: "{{ ironic_tftpd_root }}"
ironic_inspector_dhcp_interface: "{{ ironic_bmaas_interface }}" ironic_inspector_dhcp_interface: "{{ ironic_bmaas_interface }}"

2
tasks/ironic_inspector_post_install.yml
View File

@ -28,7 +28,7 @@
- name: Download IPA Images - name: Download IPA Images
get_url: get_url:
url: "{{ item.url }}" url: "{{ item.url }}"
dest: "/httpboot/{{ item.name }}" dest: "{{ ironic_inspector_httpboot_dir }}/{{ item.name }}"
checksum: "sha256:{{ item.sha_url }}" checksum: "sha256:{{ item.sha_url }}"
owner: "{{ ironic_system_user_name }}" owner: "{{ ironic_system_user_name }}"
group: "{{ ironic_system_group_name }}" group: "{{ ironic_system_group_name }}"

2
templates/ironic-ipxe.conf.j2
View File

@ -10,7 +10,7 @@ server {
# directory to store ipxe # directory to store ipxe
location / { location / {
root /httpboot; root {{ ironic_http_root }};
autoindex off; autoindex off;
expires 1h; expires 1h;
} }