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

AMI packaging improvements

Browse Source 
Several AMI packaging changes, including:

 * Set a default value for OFFICIAL=no
 * Include tower version in ami_description and tag:Name
 * Packer will tag the AMI to help with visually identifying AMIs (tags used
   include Name, aws_instance_count, product_name, product_version)
 * Removed license/* files.  The license instance count is supplied via an
   environment variable AWS_INSTANCE_COUNT
 * Update reset/install_aws.sh to require an instance count parameter (-c)
This commit is contained in:
James Laska
2014-04-29 11:19:14 -04:00
parent 74463f8945
commit 985d68a187
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -1,5 +1,6 @@
PYTHON=python PYTHON=python
SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
OFFICIAL ?= no
PACKER ?= packer PACKER ?= packer
GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color") GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color")
@@ -12,7 +13,7 @@ VERSION=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.spl
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 ?= 10.json AWS_INSTANCE_COUNT ?= 10
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=dev$(DATE) BUILD=dev$(DATE)
@@ -256,7 +257,7 @@ deb: sdist
(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")
ami: ami:
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(LICENSE_TIER)" $(NAME).json) (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" -var "official=$(OFFICIAL)" $(NAME).json)
install: install:
$(PYTHON) setup.py install egg_info -b "" $(PYTHON) setup.py install egg_info -b ""