openstack/devstack
Code Issues Proposed changes

Ironic: Use HOST_IP instead of SERVICE_HOST

Browse Source 
Ironic virtual machines boot on a different network and are expected
to fetch via tftp from the conductor and callback to the API.  We
need to ensure both endpoints are accessible, even when SERVICE_HOST
is 127.0.0.1 (eg, devstack-gate).

Change-Id: I96aee75b76ad11d83143736da00ea304db971c9c
This commit is contained in:
Adam Gandelman 2014-03-24 13:55:34 -07:00
parent e93a9cf79a
commit d301198907
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ironic
View File

@ -158,8 +158,8 @@ function configure_ironic_conductor {
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
iniset $IRONIC_CONF_FILE conductor api_url http://$SERVICE_HOST:6385 iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385
iniset $IRONIC_CONF_FILE pxe tftp_server $SERVICE_HOST iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP
iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
} }