diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-16 13:33:42 -0400 |
|---|---|---|
| committer |   Feng Pan <fpan@redhat.com> | 2017-03-16 20:43:06 +0000 |
| commit | 5a9a47fc0c3b3e7d53093ce97010fe441af6bb47 (patch) | |
| tree | 341dd82ce994c179a4922de4ce2af47d36427568 | |
| parent | 554538cff0e30f765fd5dfc25fce200c4f24f459 (diff) | |
Removes vpp-devel from package install
Change-Id: I16f5defdd47f19095f97414f46cd9e12d3c53b19
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 59120f0ddd3ad84feab0ffb9defc185f73f910a5)
| -rwxr-xr-x | build/overcloud-full.sh | 2 | ||||
| -rw-r--r-- | build/variables.sh | 1 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 4222b278..a3033025 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -112,7 +112,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "mkdir /root/dpdk_rpms" \ --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \ $dpdk_pkg_str \ - --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-devel vpp-lib vpp-api-python vpp-plugins vpp-api-java" \ + --run-command "yum install --downloadonly --downloaddir=/root/fdio vpp vpp-lib vpp-api-python vpp-plugins vpp-api-java" \ --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \ --run-command "yum install -y /root/fdio/*.rpm" \ --run-command "mkdir /root/fdio_l2" \ diff --git a/build/variables.sh b/build/variables.sh index 9bc4f87e..e8197779 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -62,7 +62,6 @@ fdio_l2_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l2_rpms fdio_l2_pkgs=( 'vpp-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-api-python-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' -'vpp-devel-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' 'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm' ) diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 02145bed..72364ae4 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -196,7 +196,7 @@ EOI # Override any previous packages if FDIO and L2 if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-devel vpp-api-python vpp-lib vpp-plugins honeycomb" \ + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \ --run-command "yum -y install /root/fdio_l2/*.rpm" \ --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \ -a overcloud-full.qcow2 |