summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-03 11:07:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-03 11:07:34 +0000
commit5f19f129420ceb97c08641fc945335c0ef1b1083 (patch)
tree5505f807b3ef4d9633bcd773dd2b8b066d3a9959 /lib
parent38b3b1399f60412ef3afcab977707bb762972e17 (diff)
parent48cbae08f2df3cde9a35c539a75a0655f6f64872 (diff)
Merge "Builds and installs ovs 2.6.1 with NSH support"
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/playbooks/build_dependencies.yml3
-rwxr-xr-xlib/overcloud-deploy-functions.sh4
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/ansible/playbooks/build_dependencies.yml b/lib/ansible/playbooks/build_dependencies.yml
index c57474a0..dec8ab7c 100644
--- a/lib/ansible/playbooks/build_dependencies.yml
+++ b/lib/ansible/playbooks/build_dependencies.yml
@@ -10,7 +10,8 @@
python34-markupsafe, python2-virtualbmc,
libguestfs-tools,bsdtar,libvirt,yum-utils,
python2-oslo-config,python2-debtcollector,
- make, python-pip, python-virtualenv, python34-pip
+ make, python34-pip, python-virtualenv,libguestfs-tools-c,
+ supermin,supermin5,perl-Sys-Guestfs,python-libguestfs
- name: Install Virtualization group
yum:
name: "@Virtualization Host"
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e90f82c0..8c5e0828 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -166,10 +166,8 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex"
fi
- # upgrade ovs into ovs 2.5.90 with NSH function if SFC is enabled
+ # upgrade ovs into ovs ovs 2.6.1 with NSH function if SFC is enabled
if [[ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['dataplane']}" == 'ovs' ]]; then
- echo "ONOS SFC is currently unavailable. JIRA: APEX-417"
- exit 1
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
--run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \