From: Tim Rozet <trozet@redhat.com>
Date: Mon, 14 May 2018 15:20:44 +0000 (-0400)
Subject: Updates undercloud/centos repo during build phase
X-Git-Tag: opnfv-6.1.0~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b5789905915f0468d18aa3c42eb469a331e8315;p=apex.git

Updates undercloud/centos repo during build phase

Some dependencies are failing to install for undercloud install because
the repo has expired on the frozen stable/fraser image.  The kernel
devel/headers packages are missing in the centos updates repo, so need
to specify their location.

Change-Id: I878323b01b624c452a06cf5fde40eaae196d91bd
Signed-off-by: Tim Rozet <trozet@redhat.com>
---

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index d4fef46c..cd2e8e85 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -172,9 +172,7 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
 
 LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
     --upload ${BUILD_ROOT}/CentOS-Updates.repo:/etc/yum.repos.d/ \
-    --run-command "yum -y install kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
-    --run-command "yum -y install kernel-headers-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
-    --run-command "yum -y install kernel-tools-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel)" \
+    --run-command "yum -y install ${CENTOS_UPDATE}/kernel-devel-\$(rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel).x86_64.rpm" \
     --upload ${BUILD_ROOT}/build_ovs_nsh.sh:/root/ \
     --upload ovs.tar.gz:/root/ \
     --run-command "cd /root/ && tar xzf ovs.tar.gz" \
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 34f22b1b..975730fa 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -37,6 +37,7 @@ populate_cache $calipso_uri_base/$calipso_script
 LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
+    --run-command "curl -L -f -o /etc/yum.repos.d/delorean.repo https://trunk.rdoproject.org/centos7-pike/current-tripleo/delorean.repo" \
     --upload ${BUILD_DIR}/apex-tripleo-heat-templates.tar.gz:/usr/share \
     --install "openstack-utils" \
     --install "ceph-common" \
diff --git a/build/variables.sh b/build/variables.sh
index 93191782..83a0a66a 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -59,3 +59,5 @@ nosdn_vpp_rpms=(
 'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.01.1-release.x86_64/vpp-lib-18.01.1-release.x86_64.rpm'
 'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.01.1-release.x86_64/vpp-api-python-18.01.1-release.x86_64.rpm'
 )
+
+CENTOS_UPDATE="http://mirror.centos.org/centos/7.4.1708/updates/x86_64/Packages"