From 64acebe7453f9bede3e3afd1dce2a72ccd19a158 Mon Sep 17 00:00:00 2001
From: Shannon Mitchell <shannon.mitchell@rackspace.com>
Date: Tue, 30 Jan 2018 15:38:57 -0600
Subject: [PATCH] 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
---
 multi-node-aio/playbooks/deploy-pxe.yml    | 22 +---------------------
 multi-node-aio/playbooks/pxe/tftp/tftp-hpa |  1 -
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/multi-node-aio/playbooks/deploy-pxe.yml b/multi-node-aio/playbooks/deploy-pxe.yml
index b6515afc..2f17816e 100644
--- a/multi-node-aio/playbooks/deploy-pxe.yml
+++ b/multi-node-aio/playbooks/deploy-pxe.yml
@@ -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 }}"
diff --git a/multi-node-aio/playbooks/pxe/tftp/tftp-hpa b/multi-node-aio/playbooks/pxe/tftp/tftp-hpa
index e1768bde..fcbafdc6 100644
--- a/multi-node-aio/playbooks/pxe/tftp/tftp-hpa
+++ b/multi-node-aio/playbooks/pxe/tftp/tftp-hpa
@@ -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"
\ No newline at end of file