From eff27157f23f31ba4a096eb783410cfd529d5fac Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Fri, 9 Dec 2016 09:50:46 -0500 Subject: [PATCH] Allow setting dhcp_provider in devstack Provide a variable IRONIC_DHCP_PROVIDER to set CONF.dhcp.dhcp_provider. This is needed to properly configure ironicclient functional tests, which don't deploy neutron. Change-Id: If601934d0c59b5dd5556336e5644832dc7564548 Partial-Bug: #1648179 (cherry picked from commit 82d7c8c588b4f802677c09d5203a84b2eb6040fd) --- devstack/lib/ironic | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 280fc7d4a4..18f8e8c06a 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -263,6 +263,9 @@ IRONIC_TERMINAL_CERT_DIR=${IRONIC_TERMINAL_CERT_DIR:-$IRONIC_DATA_DIR/terminal_c # IRONIC_{VM,HW}_NODES_FILE IRONIC_USE_LINK_LOCAL=$(trueorfalse False IRONIC_USE_LINK_LOCAL) +# Allow selecting dhcp provider +IRONIC_DHCP_PROVIDER=${IRONIC_DHCP_PROVIDER:-neutron} + # This flag is used to specify enabled network drivers IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-} @@ -777,6 +780,8 @@ function configure_ironic_conductor { if [[ -n "$IRONIC_ENABLED_NETWORK_INTERFACES" ]]; then iniset $IRONIC_CONF_FILE DEFAULT enabled_network_interfaces $IRONIC_ENABLED_NETWORK_INTERFACES fi + + iniset $IRONIC_CONF_FILE dhcp dhcp_provider $IRONIC_DHCP_PROVIDER } # create_ironic_cache_dir() - Part of the init_ironic() process