From d402905db425254d2eb81931d0ea57157094079f Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 16 Feb 2016 10:42:42 +0000 Subject: [PATCH] Use http_{root, url} config from "deploy" instead of "pxe" The commit 0a9c0e2151abca452f8bee3524dbeb2610135c69 moved the http_url and http_root configuration options from the "pxe" group to the "deploy" group. This patch is just updating DevStack to set these options for the new group. Change-Id: If34901ac9194139fb9a60260365cb09e14083cd7 --- devstack/lib/ironic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 172048b860..0d3f376a81 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -406,8 +406,8 @@ function configure_ironic_conductor { iniset $IRONIC_CONF_FILE pxe ipxe_enabled True iniset $IRONIC_CONF_FILE pxe pxe_config_template '\$pybasedir/drivers/modules/ipxe_config.template' iniset $IRONIC_CONF_FILE pxe pxe_bootfile_name $pxebin - iniset $IRONIC_CONF_FILE pxe http_root $IRONIC_HTTP_DIR - iniset $IRONIC_CONF_FILE pxe http_url "http://$IRONIC_HTTP_SERVER:$IRONIC_HTTP_PORT" + iniset $IRONIC_CONF_FILE deploy http_root $IRONIC_HTTP_DIR + iniset $IRONIC_CONF_FILE deploy http_url "http://$IRONIC_HTTP_SERVER:$IRONIC_HTTP_PORT" fi }