Browse code

Merge "Ironic: Use HOST_IP instead of SERVICE_HOST"

Jenkins authored on 2014/03/26 02:37:48
Showing 1 changed files
... ...
@@ -171,8 +171,8 @@ function configure_ironic_conductor {
171 171
     cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
172 172
 
173 173
     iniset $IRONIC_CONF_FILE DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
174
-    iniset $IRONIC_CONF_FILE conductor api_url http://$SERVICE_HOST:6385
175
-    iniset $IRONIC_CONF_FILE pxe tftp_server $SERVICE_HOST
174
+    iniset $IRONIC_CONF_FILE conductor api_url http://$HOST_IP:6385
175
+    iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP
176 176
     iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
177 177
     iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
178 178
 }