1. devstack
  2. Commit d3011989070f81f488f2cd8f83435b6b4881d1d6
Browse code

Ironic: Use HOST_IP instead of SERVICE_HOST

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

Adam Gandelman authored on 2014/03/25 05:55:34
Showing 1 changed files
lib/ironic
History View file @ d301198
... ... 
@@ -158,8 +158,8 @@ function configure_ironic_conductor {
158 158 
     cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
159 159
160 160 
     iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
161 
-    iniset $IRONIC_CONF_FILE conductor api_url http://$SERVICE_HOST:6385
162 
-    iniset $IRONIC_CONF_FILE pxe tftp_server $SERVICE_HOST
161 
+    iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385
162 
+    iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP
163 163 
     iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
164 164 
     iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
165 165 
 }