Update mirror list for ISO build
Since we don't have staging mirror process we need to update mirror lists Closes-bug: #1511696 Change-Id: I2b1027255c655d51578b0b3ab58189dced911aa7
This commit is contained in:
parent
b9b39ee9d3
commit
4b1f91ad49
42
config.mk
42
config.mk
|
@ -159,58 +159,48 @@ LOCAL_MIRROR_DOCKER_BASEURL:=$(LOCAL_MIRROR_DOCKER)
|
||||||
USE_MIRROR?=ext
|
USE_MIRROR?=ext
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),ext)
|
ifeq ($(USE_MIRROR),ext)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/centos
|
MIRROR_CENTOS?=http://vault.centos.org/$(CENTOS_RELEASE)
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
||||||
SANDBOX_MIRROR_CENTOS_UPSTREAM?=http://vault.centos.org/$(CENTOS_RELEASE)
|
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
||||||
MIRROR_UBUNTU?=mirror.fuel-infra.org
|
MIRROR_UBUNTU?=mirror.fuel-infra.org
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://mirror.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://mirror.fuel-infra.org/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),srt)
|
ifeq ($(USE_MIRROR),srt)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://osci-mirror-srt.srt.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://osci-mirror-srt.srt.mirantis.net/fwm/$(PRODUCT_VERSION)/centos
|
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
|
||||||
MIRROR_UBUNTU?=osci-mirror-srt.srt.mirantis.net
|
MIRROR_UBUNTU?=osci-mirror-srt.srt.mirantis.net
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://osci-mirror-srt.srt.mirantis.net/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://osci-mirror-srt.srt.mirantis.net/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),msk)
|
ifeq ($(USE_MIRROR),msk)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://osci-mirror-msk.msk.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://osci-mirror-msk.msk.mirantis.net/fwm/$(PRODUCT_VERSION)/centos
|
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
|
||||||
MIRROR_UBUNTU?=osci-mirror-msk.msk.mirantis.net
|
MIRROR_UBUNTU?=osci-mirror-msk.msk.mirantis.net
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://osci-mirror-msk.msk.mirantis.net/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://osci-mirror-msk.msk.mirantis.net/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),hrk)
|
ifeq ($(USE_MIRROR),hrk)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://osci-mirror-kha.kha.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://osci-mirror-kha.kha.mirantis.net/fwm/$(PRODUCT_VERSION)/centos
|
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
|
||||||
MIRROR_UBUNTU?=osci-mirror-kha.kha.mirantis.net
|
MIRROR_UBUNTU?=osci-mirror-kha.kha.mirantis.net
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://osci-mirror-kha.kha.mirantis.net/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://osci-mirror-kha.kha.mirantis.net/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),usa)
|
ifeq ($(USE_MIRROR),usa)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://mirror.seed-us1.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://mirror.seed-us1.fuel-infra.org/fwm/$(PRODUCT_VERSION)/centos
|
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
|
||||||
MIRROR_UBUNTU?=mirror.seed-us1.fuel-infra.org
|
MIRROR_UBUNTU?=mirror.seed-us1.fuel-infra.org
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://mirror.seed-us1.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://mirror.seed-us1.fuel-infra.org/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(USE_MIRROR),cz)
|
ifeq ($(USE_MIRROR),cz)
|
||||||
YUM_REPOS?=proprietary
|
MIRROR_FUEL?=http://mirror.seed-cz1.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||||
MIRROR_CENTOS?=http://mirror.seed-cz1.fuel-infra.org/fwm/$(PRODUCT_VERSION)/centos
|
|
||||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
|
||||||
MIRROR_UBUNTU?=mirror.seed-cz1.fuel-infra.org
|
MIRROR_UBUNTU?=mirror.seed-cz1.fuel-infra.org
|
||||||
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
|
||||||
MIRROR_DOCKER?=http://mirror.seed-cz1.fuel-infra.org/fwm/$(PRODUCT_VERSION)/docker
|
MIRROR_DOCKER?=http://mirror.seed-cz1.fuel-infra.org/docker/$(PRODUCT_VERSION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Which repositories to use for making local centos mirror.
|
# Which repositories to use for making local centos mirror.
|
||||||
|
@ -240,8 +230,8 @@ MIRROR_DOCKER?=http://mirror.fuel-infra.org/docker/$(PRODUCT_VERSION)
|
||||||
|
|
||||||
# MIRROR_FUEL affects build process only if YUM_REPOS variable contains 'fuel'.
|
# MIRROR_FUEL affects build process only if YUM_REPOS variable contains 'fuel'.
|
||||||
# Otherwise it is ignored entirely.
|
# Otherwise it is ignored entirely.
|
||||||
# MIRROR_FUEL?=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos6-fuel/os/x86_64
|
# MIRROR_FUEL?=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64
|
||||||
MIRROR_FUEL?=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos6-fuel/os/x86_64
|
MIRROR_FUEL?=http://perestroika-repo-tst.infra.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64
|
||||||
|
|
||||||
# Additional CentOS repos.
|
# Additional CentOS repos.
|
||||||
# Each repo must be comma separated tuple with repo-name and repo-path.
|
# Each repo must be comma separated tuple with repo-name and repo-path.
|
||||||
|
|
|
@ -103,22 +103,12 @@ endef
|
||||||
define yum_repo_fuel
|
define yum_repo_fuel
|
||||||
[fuel]
|
[fuel]
|
||||||
name=Mirantis OpenStack Custom Packages
|
name=Mirantis OpenStack Custom Packages
|
||||||
#mirrorlist=http://download.mirantis.com/epel-fuel-grizzly-3.1/mirror.internal.list
|
|
||||||
baseurl=$(MIRROR_FUEL)
|
baseurl=$(MIRROR_FUEL)
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
enabled=1
|
enabled=1
|
||||||
priority=20
|
priority=20
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define yum_repo_proprietary
|
|
||||||
[proprietary]
|
|
||||||
name = CentOS $(CENTOS_RELEASE) - Proprietary
|
|
||||||
baseurl = $(MIRROR_CENTOS)/os/$(CENTOS_ARCH)
|
|
||||||
gpgcheck = 0
|
|
||||||
enabled = 1
|
|
||||||
priority=20
|
|
||||||
endef
|
|
||||||
|
|
||||||
# Accept EXTRA_RPM_REPOS in a form of a list of: name,url,priority
|
# Accept EXTRA_RPM_REPOS in a form of a list of: name,url,priority
|
||||||
# Accept EXTRA_RPM_REPOS in a form of list of (default priority=10): name,url
|
# Accept EXTRA_RPM_REPOS in a form of list of (default priority=10): name,url
|
||||||
get_repo_name=$(shell echo $1 | cut -d ',' -f 1)
|
get_repo_name=$(shell echo $1 | cut -d ',' -f 1)
|
||||||
|
|
Loading…
Reference in New Issue