summaryrefslogtreecommitdiffstats
path: root/build/undercloud.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-01-25 11:42:19 -0500
committerTim Rozet <trozet@redhat.com>2017-01-25 11:42:19 -0500
commit54a3e4c68e8790d989c9a5986ecb4f7b57c13aca (patch)
tree835fa8adfeb0544c8941c8308bcfb13e9eb26725 /build/undercloud.sh
parent47f3e38031fc35fb14982b62633b30a92f16a820 (diff)
Fixes yum update on undercloud
We had already disabled this via puppet, but the code upstream was moved into python. This patch now disables it in python. JIRA: APEX-382 Change-Id: Ib8bb82945244818b1de0f26e3e80f599be72e8f6 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/undercloud.sh')
-rwxr-xr-xbuild/undercloud.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh
index adf08eaf..a0210131 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -72,7 +72,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ${BUILD_ROOT}/set_perf_images.sh:/home/stack \
--upload ${BUILD_DIR}/image.py:/root \
--upload ${BUILD_DIR}/image.pyc:/root \
- --run-command "sed -i '/pkg_upgrade_cmd =/c\\ \$pkg_upgrade_cmd =echo' /usr/share/instack-undercloud/puppet-stack-config/puppet-stack-config.pp" \
+ --upload ${BUILD_ROOT}/0001-Removes-doing-yum-update.patch:/usr/lib/python2.7/site-packages/ \
+ --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < 0001-Removes-doing-yum-update.patch" \
-a undercloud_build.qcow2
mv -f undercloud_build.qcow2 undercloud.qcow2