From 94ffefd5c429e70d7a335fca8e3ffa5e371af9e3 Mon Sep 17 00:00:00 2001 From: Michal Skalski Date: Mon, 8 Aug 2016 11:57:03 +0000 Subject: Updated armband Project: fuel 86d6be410288ff3865f929fdc64435c7cc572c8e bootstrap_admin_node: Fix connectivity check. After Fuel Master builds the bootstrap image at first boot, internet connectivity is tested using the URL for the CentOS updates repository. bootstrap_admin_node.sh script parses the output of `yum repolist`, looking for entries like 'Repo-baseurl: http://...'. However, in Fuel 9.0, points to a mirrorlist file (a text file containing a list of possible mirror URLs) instead of being a single, direct link to the repository. Also, note that in Fuel9, and repos are disabled by default. For now, we only test that we can access the mirrorlist file, while the check should be performed against the mirror(s). Old (Fuel 8) repo entry format: Repo-baseurl: http://mirror.fuel-infra.org/.../updates/x86_64/ New (Fuel 9) mirrorlist format: Repo-mirrors: http://mirror.fuel-infra.org/.../mos-mirrors-updates.txt Backported from upstream change [1], which should fix bug [2]. This change will get merged upstream in Fuel 10. [1] https://review.openstack.org/#/c/335094/ [2] https://bugs.launchpad.net/fuel/+bug/1596981 Change-Id: Ibec397af2e1d925a011907f14e1d655741e280fb Signed-off-by: Alexandru Avadanii --- upstream/fuel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'upstream/fuel') diff --git a/upstream/fuel b/upstream/fuel index c15c41b9..86d6be41 160000 --- a/upstream/fuel +++ b/upstream/fuel @@ -1 +1 @@ -Subproject commit c15c41b96c1922fcb2b9bbb2661b3ae562fda375 +Subproject commit 86d6be410288ff3865f929fdc64435c7cc572c8e -- cgit 1.2.3-korg