From 7c24514a3f4a3251c371aacfe94d18275e9de154 Mon Sep 17 00:00:00 2001
From: Michael Davies <michael@the-davies.net>
Date: Wed, 9 Mar 2016 00:33:35 +0000
Subject: [PATCH] Setup tftp for all scenarios

Currently tftp is only set up when ironic is setup for standalone
usage. This is incorrect. tftp is required for all use cases.

Change-Id: Ic47b71c0d9113d128d547247045a03cad4c20c82
---
 tasks/ironic_conductor_post_install.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tasks/ironic_conductor_post_install.yml b/tasks/ironic_conductor_post_install.yml
index 157dd1c4..3821415a 100644
--- a/tasks/ironic_conductor_post_install.yml
+++ b/tasks/ironic_conductor_post_install.yml
@@ -21,7 +21,7 @@
   notify:
     - Restart isc-dhcp-server
   tags:
-    - tftpd-hpa
+    - isc-dhcp-server
 
 - name: Create /tftpboot
   file:
@@ -30,7 +30,6 @@
     owner: "{{ ironic_system_user_name }}"
     group: "{{ ironic_system_group_name }}"
     mode: "0755"
-  when: ironic_standalone
   tags:
     - tftpd-hpa
 
@@ -38,7 +37,6 @@
   copy:
     src: tftpd-hpa
     dest: /etc/default/tftpd-hpa
-  when: ironic_standalone
   notify:
     - Restart tftpd-hpa
   tags:
@@ -48,7 +46,6 @@
   copy:
     src: map-file
     dest: /tftpboot/map-file
-  when: ironic_standalone
   notify:
     - Restart tftpd-hpa
   tags:
@@ -57,32 +54,30 @@
 - name: Check to see if pxlinux.0 is required
   stat: path=/tftpboot/pxelinux.0
   register: pxelinux_exists
-  when: ironic_standalone
   tags:
     - tftpd-hpa
 
 - name: Check to see if chain.c32 is required
   stat: path=/tftpboot/chain.c32
   register: chain32_exists
-  when: ironic_standalone
   tags:
     - tftpd-hpa
 
 - name: Check pxlinux.0 exists
   stat: path=/usr/lib/syslinux/pxelinux.0
   register: pxelinux_stat
-  when: not pxelinux_exists and ironic_standalone
+  when: not pxelinux_exists
   tags:
     - tftpd-hpa
 
 - name: Copy syslinux pxlinux.0
   command: cp /usr/lib/syslinux/pxelinux.0 /tftpboot/pxelinux.0
-  when: not pxelinux_exists and pxelinux_stat.stat.exists and ironic_standalone
+  when: not pxelinux_exists and pxelinux_stat.stat.exists
   tags:
     - tftpd-hpa
 
 - name: Copy syslinux chain.c32
   command: cp /usr/lib/syslinux/chain.c32 /tftpboot/chain.c32
-  when: not chain32_exists and chain32_stat.stat.exists and ironic_standalone
+  when: not chain32_exists and chain32_stat.stat.exists
   tags:
     - tftpd-hpa