From a66b50c659eb615ec837437a4f39d3848e861fcb Mon Sep 17 00:00:00 2001 From: Dmitry Teselkin Date: Wed, 24 Feb 2016 09:37:22 +0000 Subject: [PATCH] Use CentOS 7 release for master node A commit similar to this one was applied (and then reverted because of some issues) some time ago to switch ISO to CentOS-7.2. When all issues were resolved we finally have switched to CentOS-7 using intermediate snapshots that updating constantly. A path to snapshot to use is passed from CI rather than should be generated inside fuel-main as it was before. However, there are community builds that doesn't use snapshotting mechanism but also should be switched to CentOS-7. This commit does this, switching ISO to consume the latest CentOS release [1, 2] [1]. http://mirror.centos.org/centos/7/ [2]. https://specs.openstack.org/openstack/fuel-specs/specs/9.0/switch-to-centos-7-2.html Blueprint: switch-to-centos-7-2 Change-Id: I117343c29921238aaef73d7deb3494ea1421e404 --- config.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config.mk b/config.mk index 4108b005a..3c6995397 100644 --- a/config.mk +++ b/config.mk @@ -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