From: Dan Radez <dradez@redhat.com>
Date: Thu, 22 Oct 2015 23:45:05 +0000 (-0400)
Subject: minor update to build dependancies
X-Git-Tag: brahmaputra.1.rc0~55
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F2819%2F1;p=apex.git

minor update to build dependancies

removing libvirt package depenency, qemu-kvm maybe enough
probably will have to evolve this list over time

remove the openvswitch agent bounce from deploy
this was a workaround for a bug that has been fixed

Change-Id: Iad556da3b08cca234bd4d584b1a42b6fa45d6e4f
Signed-off-by: Dan Radez <dradez@redhat.com>
---

diff --git a/build/opnfv-apex.spec b/build/opnfv-apex.spec
index b0c1fa5d..5173565c 100644
--- a/build/opnfv-apex.spec
+++ b/build/opnfv-apex.spec
@@ -9,8 +9,8 @@ URL:		https://gerrit.opnfv.org/gerrit/apex.git
 Source0:	opnfv-apex.tar.gz
 
 BuildArch:	noarch
-BuildRequires:	openvswitch libvirt qemu-kvm
-Requires:	openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools
+BuildRequires:	openvswitch qemu-kvm
+Requires:	openvswitch qemu-kvm bridge-utils libguestfs-tools
 
 %description
 These files are disk images used to launch the instack
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 1d18d057..482c1bff 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -235,9 +235,6 @@ ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/.ssh/id_rsa.pub" >>
 ##params: none 
 function undercloud_prep_overcloud_deploy {
 
-  # make sure neturon ovs agent is running
-  ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "if ! systemctl status neutron-openvswitch-agent > /dev/null; then systemctl start neutron-openvswitch-agent; fi"
-
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 source stackrc
 set -o errexit