openstack/devstack
Code Issues Proposed changes

Merge "Ironic: Use HOST_IP instead of SERVICE_HOST"

Browse Source
This commit is contained in:
Jenkins 2014-03-25 17:37:48 +00:00 committed by Gerrit Code Review
commit b65dc0afee
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

@ -171,8 +171,8 @@ function configure_ironic_conductor {
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 conductor api_url http://$SERVICE_HOST:6385
iniset $IRONIC_CONF_FILE pxe tftp_server $SERVICE_HOST
iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385
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_master_path $IRONIC_TFTPBOOT_DIR/master_images
}