Change HTTP_SERVER's default value to TFTPSERVER_IP

Currently both HTTP_SERVER and TFTPSERVER_IP are default to HOST_IP,
then when ipxe enabled and you want to change server address, you may
need to change twice. This patch restructures IP address dependency
among HOST_IP, TFTPSERVER_IP and HTTP_SERVER, so that it can be
facilitated changing IP address for the typical setup in which ironic
conductor and api are binding to HOST_IP, and TFTP and HTTP servers are
binding to a different IP.

Change-Id: Ie884e41d2a5a6121a0bab9f1e2537e3fc9963b07
This commit is contained in:
Zhenguo Niu 2016-05-21 15:34:06 +08:00
parent 248a4ac427
commit 567b078d6e

View File

@ -179,7 +179,7 @@ IRONIC_HOSTPORT=${IRONIC_HOSTPORT:-$SERVICE_HOST:$IRONIC_SERVICE_PORT}
# Enable iPXE
IRONIC_IPXE_ENABLED=$(trueorfalse True IRONIC_IPXE_ENABLED)
IRONIC_HTTP_DIR=${IRONIC_HTTP_DIR:-$IRONIC_DATA_DIR/httpboot}
IRONIC_HTTP_SERVER=${IRONIC_HTTP_SERVER:-$HOST_IP}
IRONIC_HTTP_SERVER=${IRONIC_HTTP_SERVER:-$IRONIC_TFTPSERVER_IP}
IRONIC_HTTP_PORT=${IRONIC_HTTP_PORT:-8088}
# Whether DevStack will be setup for bare metal or VMs