openstack/openstack-helm
Code Issues Proposed changes

Merge "Check return value of get subnets before iterate for ironic"

Browse Source
This commit is contained in:
Zuul 2020-02-13 20:37:26 +00:00 committed by Gerrit Code Review
commit c591479c8b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ironic/templates/bin/_manage-cleaning-network.sh.tpl
View File

@ -28,13 +28,16 @@ else
IRONIC_NEUTRON_CLEANING_NET_ID=$(openstack network show ${neutron_network_name} -f value -c id)
fi
for SUBNET in $(openstack network show $IRONIC_NEUTRON_CLEANING_NET_ID -f value -c subnets); do
CURRENT_SUBNET=$(openstack subnet show $SUBNET -f value -c name)
if [ "x${CURRENT_SUBNET}" == "x${neutron_subnet_name}" ]; then
openstack subnet show ${neutron_subnet_name}
SUBNET_EXISTS=true
fi
done
SUBNETS=$(openstack network show $IRONIC_NEUTRON_CLEANING_NET_ID -f value -c subnets)
if [ "x${SUBNETS}" != "x[]" ]; then
for SUBNET in ${SUBNETS}; do
CURRENT_SUBNET=$(openstack subnet show $SUBNET -f value -c name)
if [ "x${CURRENT_SUBNET}" == "x${neutron_subnet_name}" ]; then
openstack subnet show ${neutron_subnet_name}
SUBNET_EXISTS=true
fi
done
fi
if [ "x${SUBNET_EXISTS}" != "xtrue" ]; then
openstack subnet create \