diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-10-07 13:21:56 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2016-10-07 22:53:07 +0000 |
| commit | e61c1eb1bd369e8adb754ff879d1df67aff6c6b8 (patch) | |
| tree | 57b3cba65cad0c62a6a973ce932b88186a7d061f | |
| parent | 9fc4054fad9a18ad49f53ef10f407248fec237c5 (diff) | |
Remove yum udpate all from overcloud build
Also changes python path in networking-vpp spec to use abolsute path.
This avoids issues when python path is found on a different path
on build machine.
Change-Id: Icc2951bc66ba0b2ab0510083ecad6e680da9d5fc
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit dfe970932417a0a6ceca1b84d16aa51ba30e07f3)
| -rwxr-xr-x | build/overcloud-full.sh | 3 | ||||
| -rw-r--r-- | build/rpm_specs/networking-vpp.spec | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 7af3f831..b148542f 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -119,8 +119,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "yum install -y etcd" \ --run-command "pip install python-etcd" \ --run-command "puppet module install cristifalcas/etcd" \ + --run-command "yum update -y puppet" \ --install "centos-release-qemu-ev" \ - --run-command "yum update -y" \ + --run-command "yum update -y qemu-kvm-ev" \ --run-command "yum remove -y qemu-system-x86" \ --upload ../os-net-config.tar.gz:/usr/lib/python2.7/site-packages \ --run-command "cd /usr/lib/python2.7/site-packages/ && rm -rf os_net_config && tar xzf os-net-config.tar.gz" \ diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec index 28d3482b..2fd4e049 100644 --- a/build/rpm_specs/networking-vpp.spec +++ b/build/rpm_specs/networking-vpp.spec @@ -38,7 +38,7 @@ WantedBy=multi-user.target EOF %install -python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +/usr/bin/python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES mkdir -p %{buildroot}/usr/lib/systemd/system install %{_builddir}/networking-vpp-agent.service %{buildroot}/usr/lib/systemd/system |