Merge "brbm bridge creation failed during deployment"
authorTim Rozet <trozet@redhat.com>
Tue, 24 May 2016 14:24:23 +0000 (14:24 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 24 May 2016 14:24:23 +0000 (14:24 +0000)
ci/deploy.sh

index 9cdd829..2853f18 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>