diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-05-24 14:24:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-24 14:24:23 +0000 |
| commit | e4de3789bc5d9f3af141f9c822adf7dde94bde58 (patch) | |
| tree | 19d397407f3f519b76a9d6a63de686e1eeb3d558 | |
| parent | be03cde24377105b340bbd2d5acae84617ffb7c6 (diff) | |
| parent | 914dd0ac2060502737353803c7fc869d78afa18f (diff) | |
Merge "brbm bridge creation failed during deployment"
| -rwxr-xr-x | ci/deploy.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9cdd8297..2853f188 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> |