From: Dan Radez <dradez@redhat.com>
Date: Wed, 16 Dec 2015 20:17:19 +0000 (-0500)
Subject: remove openstack-neutron-openvswitch, odl manages ovs
X-Git-Tag: brahmaputra.1.rc0~25
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2560400e61f52b8fbd31f9fd674596f123887258;p=apex.git

remove openstack-neutron-openvswitch, odl manages ovs

Change-Id: I799eee7713f5dae213f97f3d9f59dc2defaf3159
---

diff --git a/build/instack.sh b/build/instack.sh
index dfa93943..522ff8de 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -214,8 +214,9 @@ pushd stack
 # make a copy of the cached overcloud-full image
 cp overcloud-full.qcow2 overcloud-full-odl.qcow2
 
-# install nessesary packages
-LIBGUESTFS_BACKEND=direct virt-customize --upload /etc/yum.repos.d/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
+# remove unnessesary packages and install nessesary packages
+LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y openstack-neutron-openvswitch" \
+    --upload /etc/yum.repos.d/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
     --install opendaylight,python-networking-odl -a overcloud-full-odl.qcow2
 
 ## WORK AROUND