diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-full.sh | 5 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 811249b4..cfda0398 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -112,11 +112,10 @@ 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-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" \ + --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \ $fdio_l2_pkg_str \ + --run-command "yum install -y /root/fdio_l2/*.rpm" \ --run-command "yum install -y etcd" \ --install python-etcd \ --run-command "puppet module install cristifalcas/etcd" \ diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 498154d8..a668bfed 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -90,9 +90,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "wget ${fdio_l2_uri_base}/honeycomb-1.17.04-2439.noarch.rpm -O /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \ --run-command "wget ${fdio_l2_uri_base}/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm -O /root/fdio_l2/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm" \ --install opendaylight,python-networking-odl \ - --install honeycomb \ - --upload ${BUILD_ROOT}/honeycomb-jar-replace.sh:/root/ \ - --run-command "/root/honeycomb-jar-replace.sh" \ + --run-command "yum install -y /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \ --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \ --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \ |