From affb541c3f0966f686c18dd10ddb640e4686449d Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 9 Oct 2015 11:45:52 +0100
Subject: [PATCH] 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
---
 scripts/gate-check-commit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index b25d3b3f43..d1a12a4fa0 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -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