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

Merge pull request #216 from jlaska/packer_improvements

Browse Source 
Update packer configuration to include vagrant
This commit is contained in:
James Laska
2015-05-15 15:36:44 -04:00
parent a84aed63c9 8ce0674f2c
commit 89a4e43cd0
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -58,6 +58,10 @@ pep8.txt
tools/vagrant/local.yml tools/vagrant/local.yml
.vagrant* .vagrant*
# Virtualbox
ansible-tower-*-ova
ansible-tower-*.box
# Setup # Setup
setup.log setup.log
backup.log backup.log

35
Makefile
View File

@@ -21,7 +21,7 @@ else
endif endif
# Allow AMI license customization # Allow AMI license customization
AWS_INSTANCE_COUNT ?= 100 AWS_INSTANCE_COUNT ?= 0
# TAR build parameters # TAR build parameters
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
@@ -70,7 +70,8 @@ MOCK_CFG ?=
develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \ develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \
receiver test test_coverage coverage_html ui_analysis_report test_ui test_jenkins dev_build \ receiver test test_coverage coverage_html ui_analysis_report test_ui test_jenkins dev_build \
release_build release_clean sdist rpmtar mock-rpm mock-srpm \ release_build release_clean sdist rpmtar mock-rpm mock-srpm \
deb deb-src debian reprepro setup_tarball sync_ui deb deb-src debian reprepro setup_tarball sync_ui \
virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6
# Remove setup build files # Remove setup build files
clean-tar: clean-tar:
@@ -95,8 +96,17 @@ clean-ui:
rm -rf awx/ui/dist rm -rf awx/ui/dist
rm -rf awx/ui/static/docs rm -rf awx/ui/static/docs
# Remove packer artifacts
clean-packer:
rm -rf packer_cache
rm -rf packaging/packer/packer_cache
rm -rf packaging/packer/output-virtualbox-iso/
rm -f packaging/packer/ansible-tower-*.box
rm -rf packaging/packer/ansible-tower*-ova
rm -f Vagrantfile
# Remove temporary build files, compiled Python files. # Remove temporary build files, compiled Python files.
clean: clean-rpm clean-deb clean-grunt clean-ui clean-tar clean: clean-rpm clean-deb clean-grunt clean-ui clean-tar clean-packer
rm -rf dist/* rm -rf dist/*
rm -rf build $(NAME)-$(VERSION) *.egg-info rm -rf build $(NAME)-$(VERSION) *.egg-info
find . -type f -regex ".*\.py[co]$$" -delete find . -type f -regex ".*\.py[co]$$" -delete
@@ -427,8 +437,23 @@ reprepro: deb
reprepro --keepunreferencedfiles --export=force -b reprepro --ignore=brokenold includedeb $${DIST} $${DEB} ; \ reprepro --keepunreferencedfiles --export=force -b reprepro --ignore=brokenold includedeb $${DIST} $${DEB} ; \
done; \ done; \
ami: amazon-ebs:
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" -var "official=$(OFFICIAL)" $(NAME).json) cd packaging/packer && $(PACKER) build -only $@ $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" packer-$(NAME).json
virtualbox-ovf: packaging/packer/ansible-tower-$(VERSION)-virtualbox.box
packaging/packer/ansible-tower-$(VERSION)-virtualbox.box: packaging/packer/output-virtualbox-iso/centos-7.ovf
cd packaging/packer && $(PACKER) build -only virtualbox-ovf $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" packer-$(NAME).json
packaging/packer/output-virtualbox-iso/centos-6.ovf:
cd packaging/packer && $(PACKER) build packer-centos-6.json
virtualbox-centos-6: packaging/packer/output-virtualbox-iso/centos-6.ovf
packaging/packer/output-virtualbox-iso/centos-7.ovf:
cd packaging/packer && $(PACKER) build packer-centos-7.json
virtualbox-centos-7: packaging/packer/output-virtualbox-iso/centos-7.ovf
install: install:
$(PYTHON) setup.py install egg_info -b "" $(PYTHON) setup.py install egg_info -b ""