summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-28 17:32:03 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-28 17:34:06 +0200
commitab98c79af06e483952e9d4dbc38f51972fc5bf66 (patch)
treeb5f2c2b7c5a02fab1f568303e66175952b309e40
parentd9d2a471af92acba3ca9ae075c9496fc769826a3 (diff)
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, <updates> 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. 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 Closes-Bug: #1596981 Change-Id: I21268dd8aa8cd633f09f921b4a9e1c057a4b8ed3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Notes
Notes (review): Code-Review+1: Maksim Malchuk <mmalchuk@mirantis.com> Code-Review+1: Sergey Kulanov <skulanov@mirantis.com> Code-Review+2: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Code-Review+1: Stanislaw Bogatkin <sbogatkin@mirantis.com> Workflow+1: Vladimir Kozhukalov <vkozhukalov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 31 Aug 2016 12:31:58 +0000 Reviewed-on: https://review.openstack.org/335094 Project: openstack/fuel-main Branch: refs/heads/master
-rwxr-xr-xiso/bootstrap_admin_node.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh
index 655bc51..23d305d 100755
--- a/iso/bootstrap_admin_node.sh
+++ b/iso/bootstrap_admin_node.sh
@@ -545,8 +545,8 @@ else
545fi 545fi
546 546
547#Check if repo is accessible 547#Check if repo is accessible
548echo "Checking for access to updates repository..." 548echo "Checking for access to updates repository/mirrorlist..."
549repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl" && $3 ~ "updates") print $3}' | head -1) 549repourl=$(yum repolist all -v | awk '{if ($1 ~ "baseurl|mirrors" && $3 ~ "updates") print $3}' | head -1)
550if urlaccesscheck check "$repourl" ; then 550if urlaccesscheck check "$repourl" ; then
551 UPDATE_ISSUES=0 551 UPDATE_ISSUES=0
552else 552else