From 7d50c04bf77296f4db9f3c98ed7513598e270676 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Thu, 13 Mar 2014 16:36:14 +0400 Subject: [PATCH] Remove hardcoded /tftpboot/ from token's tftp path Since file to be fetched from the root tftp directory it shouldn't contain any hardcoded path. Additionaly it eliminates bearing with map-file containing regular expressions for tftp path replacement. Change-Id: Iee1672834f735d7dfefce43000540522e1d053b9 Closes-Bug: #1291533 --- elements/deploy-ironic/init.d/80-deploy-ironic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elements/deploy-ironic/init.d/80-deploy-ironic b/elements/deploy-ironic/init.d/80-deploy-ironic index 9dc058539..db7fbbf08 100644 --- a/elements/deploy-ironic/init.d/80-deploy-ironic +++ b/elements/deploy-ironic/init.d/80-deploy-ironic @@ -28,7 +28,7 @@ fi TOKEN_FILE=token-$DEPLOYMENT_ID -if tftp -r /tftpboot/$TOKEN_FILE -g $BOOT_SERVER +if tftp -r $TOKEN_FILE -g $BOOT_SERVER then TOKEN_HEADER="-H 'X-Auth-Token: `cat $TOKEN_FILE`'" else TOKEN_HEADER="" fi