openstack/ironic
Code Issues Proposed changes

Merge "[devstack] Do not die if neutron is disabled"

Browse Source
This commit is contained in:
Jenkins 2016-03-16 17:00:59 +00:00 committed by Gerrit Code Review
commit 65bd52dee7
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

@ -476,11 +476,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