openstack
/
fuel-main
Code Issues Proposed changes

Switch config.mk to master branch for fuel projects 

Due to bug[1] in Gerrit, 7.0-only patchset has been applied  to master. We
obviously want to track master in master branch…

[1] https://code.google.com/p/gerrit/issues/detail?id=1107

Change-Id: I1c7a86711295bcb677db6778f57ab016ce53f149
Related-bug: #1466640
This commit is contained in:
Sergey Kulanov 2015-09-22 09:29:48 +03:00
parent 451317f8f1
commit 0bdcbdf5e3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.mk
View File

@ -92,13 +92,13 @@ DENY_RPM_DOWNGRADE?=1
NO_UI_OPTIMIZE:=0
# Repos and versions
FUELLIB_COMMIT?=stable/7.0
NAILGUN_COMMIT?=stable/7.0
PYTHON_FUELCLIENT_COMMIT?=stable/7.0
FUEL_AGENT_COMMIT?=stable/7.0
FUEL_NAILGUN_AGENT_COMMIT?=stable/7.0
ASTUTE_COMMIT?=stable/7.0
OSTF_COMMIT?=stable/7.0
FUELLIB_COMMIT?=master
NAILGUN_COMMIT?=master
PYTHON_FUELCLIENT_COMMIT?=master
FUEL_AGENT_COMMIT?=master
FUEL_NAILGUN_AGENT_COMMIT?=master
ASTUTE_COMMIT?=master
OSTF_COMMIT?=master
FUELLIB_REPO?=https://github.com/stackforge/fuel-library.git
NAILGUN_REPO?=https://github.com/stackforge/fuel-web.git
@ -270,7 +270,7 @@ USE_UPGRADE_PIP_ART_HTTP_LINK?=
# 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/stable/7.0/deployment/Puppetfile
# 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