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
This commit is contained in:
parent
be7068e7d8
commit
a66b50c659
10
config.mk
10
config.mk
|
@ -40,11 +40,9 @@ MASTER_NETMASK?=255.255.255.0
|
||||||
MASTER_GW?=10.20.0.1
|
MASTER_GW?=10.20.0.1
|
||||||
|
|
||||||
CENTOS_MAJOR?=7
|
CENTOS_MAJOR?=7
|
||||||
CENTOS_MINOR?=1
|
CENTOS_RELEASE:=$(CENTOS_MAJOR)
|
||||||
CENTOS_BUILD?=1503
|
|
||||||
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR).$(CENTOS_BUILD)
|
|
||||||
CENTOS_ARCH:=x86_64
|
CENTOS_ARCH:=x86_64
|
||||||
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)
|
|
||||||
UBUNTU_RELEASE:=trusty
|
UBUNTU_RELEASE:=trusty
|
||||||
UBUNTU_MAJOR:=14
|
UBUNTU_MAJOR:=14
|
||||||
UBUNTU_MINOR:=04
|
UBUNTU_MINOR:=04
|
||||||
|
@ -139,7 +137,7 @@ USE_MIRROR?=ext
|
||||||
|
|
||||||
ifeq ($(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_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)
|
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
||||||
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
||||||
MIRROR_UBUNTU?=mirror.fuel-infra.org
|
MIRROR_UBUNTU?=mirror.fuel-infra.org
|
||||||
|
@ -182,7 +180,7 @@ endif
|
||||||
# Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel
|
# Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel
|
||||||
# will be used.
|
# will be used.
|
||||||
YUM_REPOS?=official extras fuel
|
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)
|
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
||||||
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
||||||
SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel
|
SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel
|
||||||
|
|
Loading…
Reference in New Issue