From 914dd0ac2060502737353803c7fc869d78afa18f Mon Sep 17 00:00:00 2001
From: Juha Haapavirta <juha.haapavirta@nokia.com>
Date: Fri, 20 May 2016 16:52:43 +0300
Subject: brbm bridge creation failed during deployment
brbm bridge is not created during deployment because of existing random
bridge containg text brbm in it.
JIRA: APEX-153
Change-Id: I48520c2865a4de0de849c5147337dafeeb5fb51f
Signed-off-by: Juha Haapavirta <juha.haapavirta@nokia.com>
---
ci/deploy.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ci')
diff --git a/ci/deploy.sh b/ci/deploy.sh
index e11d6ee0..b0b70ddb 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -294,7 +294,7 @@ function configure_deps {
for network in ${OPNFV_NETWORK_TYPES}; do
echo "${blue}INFO: Creating Virsh Network: $network & OVS Bridge: ${NET_MAP[$network]}${reset}"
- ovs-vsctl list-br | grep ${NET_MAP[$network]} > /dev/null || ovs-vsctl add-br ${NET_MAP[$network]}
+ ovs-vsctl list-br | grep "^${NET_MAP[$network]}$" > /dev/null || ovs-vsctl add-br ${NET_MAP[$network]}
virsh net-list --all | grep $network > /dev/null || (cat > ${libvirt_dir}/apex-virsh-net.xml && virsh net-define ${libvirt_dir}/apex-virsh-net.xml) << EOF
<network>
<name>$network</name>
--
cgit