From 1b2d17b84424cc586245132d47f38646e5519e11 Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Sat, 17 Oct 2015 12:45:29 -0400
Subject: [PATCH] allow env variable override of creds file

This is important because there is an integration test, test_git, that
require an ssh key to clone a privileged github repo.
---
 test/integration/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/Makefile b/test/integration/Makefile
index b044121f5e..b89140ae65 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -6,7 +6,7 @@ ifndef CLOUD_RESOURCE_PREFIX
 CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print 'ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in xrange(8));")
 endif
 
-CREDENTIALS_FILE = credentials.yml
+CREDENTIALS_FILE ?= credentials.yml
 # If credentials.yml exists, use it
 ifneq ("$(wildcard $(CREDENTIALS_FILE))","")
 CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE)