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
(cherry picked from commit 82d7c8c588)
This commit is contained in:
Jim Rollenhagen 2016-12-09 09:50:46 -05:00 committed by Vladyslav Drok
parent 005ac6105c
commit eff27157f2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/ironic
View File

@ -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