Fix the nodepool file check

The check was meant to verify two things:
 - the nodepool file exists
 - the nodepool file is not zero size

Combining them doesn't work, though, so this was never executing
as intended. This patch fixes that.

Change-Id: I7a192614afb00d11de1fd944ff20c0c89223f5c3
This commit is contained in:
Jesse Pretorius 2015-10-09 11:45:52 +01:00
parent c88534e169
commit affb541c3f

View File

@ -56,7 +56,7 @@ mkdir -p /openstack/log/ansible-logging
sed -i '/\[defaults\]/a log_path = /openstack/log/ansible-logging/ansible.log' $(dirname ${0})/../playbooks/ansible.cfg
# Adjust settings based on the Cloud Provider info in OpenStack-CI
if [ -fs /etc/nodepool/provider ]; then
if [ -f /etc/nodepool/provider -a -s /etc/nodepool/provider ]; then
source /etc/nodepool/provider
if [[ ${NODEPOOL_PROVIDER} == "rax"* ]]; then