From 48cbae08f2df3cde9a35c539a75a0655f6f64872 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Sun, 28 May 2017 13:05:21 -0400 Subject: Builds and installs ovs 2.6.1 with NSH support Change-Id: I369b9d24880ebdb0836e42740ebf27082be9de99 Signed-off-by: Tim Rozet --- lib/ansible/playbooks/build_dependencies.yml | 3 ++- lib/overcloud-deploy-functions.sh | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lib') 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" <