summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--build/0001-Removes-doing-yum-update.patch25
-rwxr-xr-xbuild/undercloud.sh3
2 files changed, 27 insertions, 1 deletions
diff --git a/build/0001-Removes-doing-yum-update.patch b/build/0001-Removes-doing-yum-update.patch
new file mode 100644
index 00000000..86e6ea3f
--- /dev/null
+++ b/build/0001-Removes-doing-yum-update.patch
@@ -0,0 +1,25 @@
+From d04e8f730de074bafefea4c105a8270100efd9c1 Mon Sep 17 00:00:00 2001
+From: Tim Rozet <tdrozet@gmail.com>
+Date: Wed, 25 Jan 2017 09:53:17 -0500
+Subject: [PATCH] Removes doing yum update
+
+Signed-off-by: Tim Rozet <tdrozet@gmail.com>
+---
+ instack_undercloud/undercloud.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
+index 2b9ff8c..b26cb49 100644
+--- a/instack_undercloud/undercloud.py
++++ b/instack_undercloud/undercloud.py
+@@ -1209,7 +1209,6 @@ def install(instack_root):
+ _validate_configuration()
+ instack_env = _generate_environment(instack_root)
+ _generate_init_data(instack_env)
+- _run_yum_update(instack_env)
+ _run_instack(instack_env)
+ _run_orc(instack_env)
+ _post_config(instack_env)
+--
+2.9.3
+
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