External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-15 16:07:30 -02:30
Code Issues Packages Projects Releases Wiki Activity

Add official ansible-tower-1.4.5 AMI license files

Browse Source 
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.
This commit is contained in:
James Laska
2014-02-03 13:22:58 -05:00
parent 57fdacb242
commit ab7c65df1d
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -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])") VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])")
RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])")
# Allow ami license customization # Allow AMI license customization
LICENSE_TIER ?= 30 LICENSE_TIER ?= 10
PACKER_LICENSE_FILE ?= test.json
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=dev$(DATE) BUILD=dev$(DATE)
@@ -197,11 +196,8 @@ deb: sdist
@echo "ansible-tower-$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles @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") (cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles")
packer_license: ami:
@python -c "import json; fp = open('packaging/ami/license/$(PACKER_LICENSE_FILE)', 'w+'); json.dump(dict(instance_count=$(LICENSE_TIER)), fp); fp.close();" (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER).json" ansible-tower.json)
ami: packer_license
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(PACKER_LICENSE_FILE)" ansible-tower.json)
install: install:
$(PYTHON) setup.py install egg_info -b "" $(PYTHON) setup.py install egg_info -b ""