From d27a808ad08b98274453f2f2f569bdd9998953b2 Mon Sep 17 00:00:00 2001
From: Sergey Kulanov <skulanov@mirantis.com>
Date: Wed, 18 May 2016 13:33:13 +0300
Subject: [PATCH] Get rid of Mirantis related links

All related internal mirrors can be re-defined through
the env variables, so we can freely remove them

Change-Id: Iae8bb0fbba8097e67287406a8aaf378283545c5c
Closes-bug: #1582701
---
 config.mk                  | 41 +++++---------------------------------
 mirror/centos/yum_repos.mk |  2 +-
 sandbox.mk                 |  2 +-
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/config.mk b/config.mk
index cf99fbca5..c49b350e9 100644
--- a/config.mk
+++ b/config.mk
@@ -128,39 +128,8 @@ LOCAL_MIRROR_MOS_CENTOS_OS_BASEURL:=$(LOCAL_MIRROR_MOS_CENTOS)
 LOCAL_MIRROR_UBUNTU:=$(LOCAL_MIRROR)/ubuntu
 LOCAL_MIRROR_UBUNTU_OS_BASEURL:=$(LOCAL_MIRROR_UBUNTU)
 
-# Use download.mirantis.com mirror by default. Other possible values are
-# 'msk', 'srt', 'usa', 'hrk', 'cz'
-# Setting any other value or removing of this variable will cause
-# download of all the packages directly from internet
-USE_MIRROR?=ext
-
-ifeq ($(USE_MIRROR),ext)
-MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
-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
-MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
-endif
-
-ifeq ($(USE_MIRROR),srt)
-MIRROR_FUEL?=http://osci-mirror-srt.srt.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
-MIRROR_UBUNTU?=osci-mirror-srt.srt.mirantis.net
-MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
-endif
-
-ifeq ($(USE_MIRROR),msk)
-MIRROR_FUEL?=http://osci-mirror-msk.msk.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
-MIRROR_UBUNTU?=osci-mirror-msk.msk.mirantis.net
-MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
-endif
-
-ifeq ($(USE_MIRROR),hrk)
-MIRROR_FUEL?=http://osci-mirror-kha.kha.mirantis.net/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
-MIRROR_UBUNTU?=osci-mirror-kha.kha.mirantis.net
-MIRROR_MOS_UBUNTU?=$(MIRROR_UBUNTU)
-endif
-
+# Use mirror.fuel-infra.org mirror by default. Other possible values are
+# 'usa', 'cz'
 ifeq ($(USE_MIRROR),usa)
 MIRROR_FUEL?=http://mirror.seed-us1.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
 MIRROR_UBUNTU?=mirror.seed-us1.fuel-infra.org
@@ -184,19 +153,19 @@ MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
 SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
 SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel
 MIRROR_UBUNTU_METHOD?=http
-MIRROR_UBUNTU?=osci-mirror-msk.msk.mirantis.net
+MIRROR_UBUNTU?=mirror.fuel-infra.org
 MIRROR_UBUNTU_ROOT?=/pkgs/ubuntu/
 MIRROR_UBUNTU_SUITE?=$(UBUNTU_RELEASE)
 MIRROR_UBUNTU_SECTION?=main universe multiverse restricted
 MIRROR_MOS_UBUNTU_METHOD?=http
-MIRROR_MOS_UBUNTU?=perestroika-repo-tst.infra.mirantis.net
+MIRROR_MOS_UBUNTU?=mirror.fuel-infra.org
 MIRROR_MOS_UBUNTU_ROOT?=/mos-repos/ubuntu/$(PRODUCT_VERSION)
 MIRROR_MOS_UBUNTU_SUITE?=$(PRODUCT_NAME)$(PRODUCT_VERSION)
 MIRROR_MOS_UBUNTU_SECTION?=main restricted
 
 # MIRROR_FUEL affects build process only if YUM_REPOS variable contains 'fuel'.
 # Otherwise it is ignored entirely.
-MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)
+MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)/os/x86_64/
 
 # Additional CentOS repos.
 # Each repo must be comma separated tuple with repo-name and repo-path.
diff --git a/mirror/centos/yum_repos.mk b/mirror/centos/yum_repos.mk
index 21a095f59..5b089fc39 100644
--- a/mirror/centos/yum_repos.mk
+++ b/mirror/centos/yum_repos.mk
@@ -104,7 +104,7 @@ endef
 
 define yum_repo_fuel
 [fuel]
-name=Mirantis OpenStack Custom Packages
+name=Fuel Packages
 baseurl=$(MIRROR_FUEL)
 gpgcheck=0
 enabled=1
diff --git a/sandbox.mk b/sandbox.mk
index 2cdecde85..4bc3962e3 100644
--- a/sandbox.mk
+++ b/sandbox.mk
@@ -11,7 +11,7 @@ endef
 
 define yum_local_mos_repo
 [mos-local-mirror]
-name=Mirantis mirror
+name=Local mirror
 baseurl=file:///mirrors/mos-centos
 gpgcheck=0
 enabled=1