openstack
/
fuel-main
Code Issues Proposed changes

Merge "Allow to build fuel-library package without internet access"

This commit is contained in:
Jenkins 2015-08-14 14:28:04 +00:00 committed by Gerrit Code Review
parent 6961710f11 b7c40e7b0d
commit d8c726645b
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.mk
View File

@ -262,3 +262,17 @@ SAVE_UPGRADE_PIP_ART?=
# \argparse-1.2.1.tar.gz
# \docker-py-0.3.2.tar.gz
USE_UPGRADE_PIP_ART_HTTP_LINK?=
# Work-around for: LP1482667
# If not empty, will try to download prepeared upstream puppet modules source,
# which used like requirements for build fuel-library package.
# List of modules, which SHOULD be passed via this file can be found:
# https://github.com/stackforge/fuel-library/blob/master/deployment/Puppetfile
#
# Usage example:
# USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES?=http://127.0.0.1/files/upstream_modules.tar.gz
# Content example:
# upstream_modules.tar.gz:\
# \apt/metadata.json
# \concat/metadata.json
USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES?=

11
packages/module.mk
View File

@ -81,6 +81,17 @@ $(BUILD_DIR)/packages/sources/$1/$2:
cd $(BUILD_DIR)/packages/sources/$1 && gzip -9 $1.tar && mv $1.tar.gz $2
endef
# fuel-library offline build hook
ifneq ($(USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES),)
$(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION)/upstream_modules.tar.gz:
@mkdir -p $(@D)
wget -nv $(USE_PREDEFINED_FUEL_LIB_PUPPET_MODULES) -O $@.tmp
mv $@.tmp $@
$(BUILD_DIR)/packages/source_fuel-library$(PRODUCT_VERSION).done: \
$(BUILD_DIR)/packages/sources/fuel-library$(PRODUCT_VERSION)/upstream_modules.tar.gz
endif
$(BUILD_DIR)/packages/source_%.done:
$(ACTION.TOUCH)