openstack/ironic
Code Issues Proposed changes

Allow setting dhcp_provider in devstack

Browse Source 
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
This commit is contained in:
Jim Rollenhagen 2016-12-09 09:50:46 -05:00
parent b15a8cf90a
commit 82d7c8c588
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/lib/ironic
View File

@ -296,6 +296,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:-}
@ -891,6 +894,7 @@ 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
# TODO(dtantsur): change this when we change the default value.
iniset $IRONIC_CONF_FILE deploy default_boot_option netboot