summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-12-16 15:17:19 -0500
committerDan Radez <dradez@redhat.com>2015-12-16 15:17:19 -0500
commit2560400e61f52b8fbd31f9fd674596f123887258 (patch)
tree4acbe2f43ff3c824b8767ff498bee6cd5665ad7f /build
parent0c5a1682f7f16ee6fcf7c810b134f5c656bd1ee6 (diff)
remove openstack-neutron-openvswitch, odl manages ovs
Change-Id: I799eee7713f5dae213f97f3d9f59dc2defaf3159
Diffstat (limited to 'build')
-rwxr-xr-xbuild/instack.sh5
1 files changed, 3 insertions, 2 deletions
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