brbm bridge creation failed during deployment 39/14439/3
authorJuha Haapavirta <juha.haapavirta@nokia.com>
Fri, 20 May 2016 13:52:43 +0000 (16:52 +0300)
committerJuha Haapavirta <juha.haapavirta@nokia.com>
Tue, 24 May 2016 09:03:10 +0000 (12:03 +0300)
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

index e11d6ee..b0b70dd 100755 (executable)
@@ -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>