summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJuha Haapavirta <juha.haapavirta@nokia.com>2016-05-20 16:52:43 +0300
committerJuha Haapavirta <juha.haapavirta@nokia.com>2016-05-24 12:03:10 +0300
commit914dd0ac2060502737353803c7fc869d78afa18f (patch)
tree6075c3b8d1662d70edd1dbf72c946db532726a1f /ci
parente2a2aae5d7f8f3bee9404be3334beeac51d9bf5b (diff)
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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh2
1 files changed, 1 insertions, 1 deletions
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>