From ec196bae08d9dfdf71256c681af0b6703e34ff61 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Tue, 15 Mar 2016 20:45:07 +0200 Subject: [PATCH] [devstack] Do not die if neutron is disabled 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 --- devstack/lib/ironic | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 561740b975..1d357340bf 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -472,11 +472,13 @@ function create_ironic_accounts { # init_ironic() - Initialize databases, etc. function init_ironic { - # Save private network as cleaning network - local cleaning_network_uuid - cleaning_network_uuid=$(neutron net-list | grep private | get_field 1) - 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} + if is_service_enabled neutron; then + # Save private network as cleaning network + local cleaning_network_uuid + cleaning_network_uuid=$(neutron net-list | grep private | get_field 1) + 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 recreate_database ironic