openstack/ironic
Code Issues Proposed changes

[devstack] Do not die if neutron is disabled

Browse Source 
One of the recent changes added a die_if_not_set statement in
init_ironic if the script is not able to get cleaning_network_uuid
in neutron. This makes ironicclient-functional job to fail, as it
defines OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,ir-api,ir-cond.
We should die_if_not_set only when neutron is enabled.

Closes-bug: #1557709

Change-Id: I9f8f38d0fdf058417af31f44e86fff099c251082
This commit is contained in:
Vladyslav Drok 2016-03-15 20:45:07 +02:00
parent 246999fabe
commit ec196bae08
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/lib/ironic
View File

@ -472,11 +472,13 @@ function create_ironic_accounts {
# init_ironic() - Initialize databases, etc. # init_ironic() - Initialize databases, etc.
function init_ironic { function init_ironic {
# Save private network as cleaning network if is_service_enabled neutron; then
local cleaning_network_uuid # Save private network as cleaning network
cleaning_network_uuid=$(neutron net-list | grep private | get_field 1) local cleaning_network_uuid
die_if_not_set $LINENO cleaning_network_uuid "Failed to get ironic cleaning network id" cleaning_network_uuid=$(neutron net-list | grep private | get_field 1)
iniset $IRONIC_CONF_FILE neutron cleaning_network_uuid ${cleaning_network_uuid} die_if_not_set $LINENO cleaning_network_uuid "Failed to get ironic cleaning network id"
iniset $IRONIC_CONF_FILE neutron cleaning_network_uuid ${cleaning_network_uuid}
fi
# (Re)create ironic database # (Re)create ironic database
recreate_database ironic recreate_database ironic