From 4afa7a0d4d16841b265d22b95fe7089eefb69a48 Mon Sep 17 00:00:00 2001
From: James Laska <jlaska@ansible.com>
Date: Tue, 2 Dec 2014 11:29:49 -0500
Subject: [PATCH] Remove AMI vars-aws-keys.json file

When building AMI using packer, the caller is responsible for setting
the required environment variables to make packer and AWS happy.  For
guidance, refer to https://www.packer.io/docs/builders/amazon-ebs.html.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 23c57dc249..1249b1425c 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ AWS_INSTANCE_COUNT ?= 100
 ifneq ($(OFFICIAL),yes)
     SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(BUILD)
     SDIST_TAR_NAME=$(NAME)-$(VERSION)-$(BUILD)
-    PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-nightly.json
+    PACKER_BUILD_OPTS=-var-file=vars-nightly.json
 else
     SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)
     SDIST_TAR_NAME=$(NAME)-$(VERSION)
-    PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
+    PACKER_BUILD_OPTS=-var-file=vars-release.json
 endif
 SDIST_TAR_FILE=$(SDIST_TAR_NAME).tar.gz
 SETUP_TAR_FILE=$(SETUP_TAR_NAME).tar.gz