From ab7c65df1d76fb346267bfebfd81aa39e9a505df Mon Sep 17 00:00:00 2001 From: James Laska Date: Mon, 3 Feb 2014 13:22:58 -0500 Subject: [PATCH] Add official ansible-tower-1.4.5 AMI license files Update Makefile syntax to no longer generate the license as a build step. In addition, updated ansible-tower.json to provide a more descriptive ami_name and ami_description. --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7863a6a6a6..90495a542e 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,8 @@ DATE := $(shell date -u +%Y%m%d%H%M) VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])") RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") -# Allow ami license customization -LICENSE_TIER ?= 30 -PACKER_LICENSE_FILE ?= test.json +# Allow AMI license customization +LICENSE_TIER ?= 10 ifneq ($(OFFICIAL),yes) BUILD=dev$(DATE) @@ -197,11 +196,8 @@ deb: sdist @echo "ansible-tower-$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles (cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles") -packer_license: - @python -c "import json; fp = open('packaging/ami/license/$(PACKER_LICENSE_FILE)', 'w+'); json.dump(dict(instance_count=$(LICENSE_TIER)), fp); fp.close();" - -ami: packer_license - (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(PACKER_LICENSE_FILE)" ansible-tower.json) +ami: + (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER).json" ansible-tower.json) install: $(PYTHON) setup.py install egg_info -b ""