Fix tftpd-hpa configuration issues

This includes:
    - removing two bad /etc/default/tftpd-hpa tasks
    - relocating the good /etc/default/tftpd-hpa task
      to the pre-tasks area of the broken configs.
    - Removing OPTIONS from /etc/default/tftpd-hpa as they
      were causing duplicate -s config errors. The -l is
      taken care of in the init script as well.

Change-Id: Ie474fceb116c921a373f5711194e222594095e51
Closes-Bug: 1746354
This commit is contained in:
Shannon Mitchell 2018-01-30 15:38:57 -06:00
parent df5f7e7154
commit 64acebe745
2 changed files with 1 additions and 22 deletions

View File

@ -80,7 +80,7 @@
- restart nginx
- name: Drop tftp-hpa configs
copy:
template:
src: "pxe/tftp/tftp-hpa"
dest: /etc/default/tftpd-hpa
mode: "0644"
@ -89,16 +89,6 @@
notify:
- restart tftp-hpa
- name: Drop inetd configs
copy:
src: "pxe/tftp/inetd.conf"
dest: /etc/default/tftpd-hpa
mode: "0644"
owner: root
group: root
notify:
- restart tftp-hpa
- name: Download image iso(s)
get_url:
url: "{{ item.value.image_iso_url }}"
@ -172,16 +162,6 @@
tags:
- boot-menu
- name: Drop tftp-hpa configs
template:
src: "pxe/tftp/tftp-hpa"
dest: /etc/default/tftpd-hpa
mode: "0644"
owner: root
group: root
notify:
- restart tftp-hpa
- name: network scripts for pxe
template:
src: "pxe/{{ ansible_os_family | lower }}/{{ item.src }}"

View File

@ -3,4 +3,3 @@ TFTP_DIRECTORY="/var/lib/tftpboot"
TFTP_ADDRESS=":{{ tftp_port }}"
TFTP_OPTIONS="--secure"
RUN_DAEMON="yes"
OPTIONS="-l -s /var/lib/tftpboot"