openstack/tripleo-heat-templates
Code Issues Proposed changes

Make comparisons case insensitive

Browse Source 
If the values for the conditional checks are "true" rather than "True",
they would be skipped. Let's force the variable contents to lowercase to
remove the possibility of skipping the check when the value is "true"

Change-Id: I9f288ee2771c0a954beee085b6df650419978422
Closes-Bug: #1833441
This commit is contained in:
Alex Schultz
2019-06-19 09:52:06 -06:00
parent 0e01a81d70
commit 7ac8cf9c28
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
validation-scripts/all-nodes.sh
View File

@@ -39,7 +39,7 @@ function ping_controller_ips() {
fi fi
for LOCAL_NETWORK in $networks; do for LOCAL_NETWORK in $networks; do
in_network=$($(get_python) -c "import ipaddress; net=ipaddress.ip_network(u'$LOCAL_NETWORK'); addr=ipaddress.ip_address(u'$REMOTE_IP'); print(addr in net)") in_network=$($(get_python) -c "import ipaddress; net=ipaddress.ip_network(u'$LOCAL_NETWORK'); addr=ipaddress.ip_address(u'$REMOTE_IP'); print(addr in net)")
if [[ $in_network == "True" ]]; then if [[ "${in_network,,}" == "true" ]]; then
echo "Trying to ping $REMOTE_IP for local network ${LOCAL_NETWORK}." echo "Trying to ping $REMOTE_IP for local network ${LOCAL_NETWORK}."
set +e set +e
if ! ping_retry $REMOTE_IP; then if ! ping_retry $REMOTE_IP; then
@@ -125,15 +125,15 @@ function ntp_check() {
fi fi
} }
if [[ $validate_gateways_icmp == "True" ]];then if [[ "${validate_gateways_icmp,,}" == "true" ]];then
ping_default_gateways ping_default_gateways
fi fi
if [[ $validate_controllers_icmp == "True" ]];then if [[ "${validate_controllers_icmp,,}" == "true" ]];then
ping_controller_ips $(echo "$ping_test_ips" | jq -r ".$tripleo_role_name") ping_controller_ips $(echo "$ping_test_ips" | jq -r ".$tripleo_role_name")
fi fi
if [[ $validate_fqdn == "True" ]];then if [[ "${validate_fqdn,,}" == "true" ]];then
fqdn_check fqdn_check
fi fi
if [[ $validate_ntp == "True" ]];then if [[ "${validate_ntp,,}" == "true" ]];then
ntp_check ntp_check
fi fi