openstack
/
fuel-main
Code Issues Proposed changes

Merge "Use CentOS 7 release for master node"

This commit is contained in:
Jenkins 2016-03-29 15:20:21 +00:00 committed by Gerrit Code Review
parent 73bd5d9a64 a66b50c659
commit 5e63e2460e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.mk
View File

@ -40,11 +40,9 @@ MASTER_NETMASK?=255.255.255.0
MASTER_GW?=10.20.0.1
CENTOS_MAJOR?=7
CENTOS_MINOR?=1
CENTOS_BUILD?=1503
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR).$(CENTOS_BUILD)
CENTOS_RELEASE:=$(CENTOS_MAJOR)
CENTOS_ARCH:=x86_64
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)
UBUNTU_RELEASE:=trusty
UBUNTU_MAJOR:=14
UBUNTU_MINOR:=04
@ -139,7 +137,7 @@ USE_MIRROR?=ext
ifeq ($(USE_MIRROR),ext)
MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
MIRROR_CENTOS?=http://vault.centos.org/$(CENTOS_RELEASE)
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_MAJOR)
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
MIRROR_UBUNTU?=mirror.fuel-infra.org
@ -182,7 +180,7 @@ endif
# Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel
# will be used.
YUM_REPOS?=official extras fuel
MIRROR_CENTOS?=http://vault.centos.org/$(CENTOS_RELEASE)
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_MAJOR)
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel