cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12804 from chrismeyersfsu/fix-test_non_destructive_makefile

Browse source 
allow env variable override of creds file
This commit is contained in:
James Cammarata 2015-10-18 10:18:22 -04:00
commit 549bdb2503
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/integration/Makefile
View file

@ -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 range(8)));") CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print('ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8)));")
endif endif
CREDENTIALS_FILE = credentials.yml CREDENTIALS_FILE ?= credentials.yml
# If credentials.yml exists, use it # If credentials.yml exists, use it
ifneq ("$(wildcard $(CREDENTIALS_FILE))","") ifneq ("$(wildcard $(CREDENTIALS_FILE))","")
CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE) CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE)