openstack
/
ec2-api
Code Issues Proposed changes

Merge "Fix misspell word"

This commit is contained in:
Zuul 2020-02-05 22:55:07 +00:00 committed by Gerrit Code Review
parent 2b8bab7707 f56bbc3d3a
commit ff3ad2fb99
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.sh
View File

@ -230,14 +230,14 @@ else
DISABLE_EC2_CLASSIC="False" DISABLE_EC2_CLASSIC="False"
fi fi
if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
declare -a newtron_output declare -a neutron_output
readarray -s 3 -t newtron_output < <(openstack network list --external) readarray -s 3 -t neutron_output < <(openstack network list --external)
if ((${#newtron_output[@]} < 2)); then if ((${#neutron_output[@]} < 2)); then
reason="No external network is declared in Neutron." reason="No external network is declared in Neutron."
elif ((${#newtron_output[@]} > 2)); then elif ((${#neutron_output[@]} > 2)); then
reason="More than one external networks are declared in Neutron." reason="More than one external networks are declared in Neutron."
else else
EXTERNAL_NETWORK=$(echo $newtron_output | awk -F '|' '{ print $3 }') EXTERNAL_NETWORK=$(echo $neutron_output | awk -F '|' '{ print $3 }')
fi fi
die_if_not_set $LINENO EXTERNAL_NETWORK "$reason. Please set EXTERNAL_NETWORK environment variable to the external network dedicated to EC2 elastic IP operations" die_if_not_set $LINENO EXTERNAL_NETWORK "$reason. Please set EXTERNAL_NETWORK environment variable to the external network dedicated to EC2 elastic IP operations"
fi fi