commit 2cd8af79c02d5d722f9f223dc86e067319bd012d
author root <root@cfg01.vsaienko-deploy-heat-virtual-mcp11-aio-11501.bud-mk.local> Fri Nov 02 15:41:51 2018 +0000
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Nov 02 15:44:07 2018 +0000
tree 16a7a159c4256fc7e4956ed8ecc3fdca86c93aa3
parent 490a59367ba0efc8903b5dd0dd639bfaab86e276

Uphardcode tftp_server option

Change-Id: Iab49d3cfebac34906cb44710bd28fdd8af314fd7

ironic/files/pike/ironic.conf

diff --git a/ironic/files/pike/ironic.conf b/ironic/files/pike/ironic.conf
index abd8737..86b4d95 100644
--- a/ironic/files/pike/ironic.conf
+++ b/ironic/files/pike/ironic.conf
@@ -3858,7 +3858,11 @@
 
 # IP address of ironic-conductor node's TFTP server. (string
 # value)
+{%- if conductor.get('tftp_server') %}
+tftp_server = {{ conductor.tftp_server }}
+{%- else %}
 #tftp_server = $my_ip
+{%- endif %}
 
 # ironic-conductor node's TFTP root path. The ironic-conductor
 # must have read/write access to this path. (string value)

ironic/files/queens/ironic.conf

diff --git a/ironic/files/queens/ironic.conf b/ironic/files/queens/ironic.conf
index 8a7a949..668e9c1 100644
--- a/ironic/files/queens/ironic.conf
+++ b/ironic/files/queens/ironic.conf
@@ -2383,7 +2383,11 @@
 
 # IP address of ironic-conductor node's TFTP server. (string
 # value)
+{%- if conductor.get('tftp_server') %}
+tftp_server = {{ conductor.tftp_server }}
+{%- else %}
 #tftp_server = $my_ip
+{%- endif %}
 
 # ironic-conductor node's TFTP root path. The ironic-conductor
 # must have read/write access to this path. (string value)