summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-03-23 09:43:18 -0400
committerFeng Pan <fpan@redhat.com>2017-03-23 09:43:18 -0400
commit5f50df9743156ea805256e2f65815ed0075881f6 (patch)
tree97a22e417d389de2b0be5fdb4ccc738f868c633b
parent1447fa43970aac807d2490ce8e77a065fb1dbd5d (diff)
FDIO package version pinning
We are seeing some instability in latest FDIO packages, so pinning them for now. Change-Id: Iaf851bfe2f8c8ba9fe0e2da6979e61f71abeccbe Signed-off-by: Feng Pan <fpan@redhat.com>
-rwxr-xr-xbuild/overcloud-full.sh5
-rwxr-xr-xbuild/overcloud-opendaylight.sh4
-rwxr-xr-xlib/overcloud-deploy-functions.sh16
3 files changed, 11 insertions, 14 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 811249b..cfda039 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 498154d..a668bfe 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/ \
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index de7263f..8362964 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -214,14 +214,14 @@ EOI
fi
# Override any previous packages if FDIO and ODL L2
- if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${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-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
-EOI
- fi
+ #if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${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-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
+#EOI
+ #fi
# check if ceph should be enabled
if [ "${deploy_options_array['ceph']}" == 'True' ]; then