diff options
| author | Pavel Glushchak <pglushchak@virtuozzo.com> | 2017-06-27 13:55:51 +0300 |
|---|---|---|
| committer | Pavel Gluschak (scsnow) <pglushchak@virtuozzo.com> | 2017-07-24 08:50:45 +0000 |
| commit | 4489bf24d84dc8a4a2489e65117a55857c0b8ade (patch) | |
| tree | d6ebdd9c3e1cb66f86b31538e11dd2d21f50e653 | |
| parent | f10a2496a0338abe591b43e9998187de3ace485b (diff) | |
| download | kolla-4489bf24d84dc8a4a2489e65117a55857c0b8ade.tar.gz kolla-4489bf24d84dc8a4a2489e65117a55857c0b8ade.zip | |
Ensure interface exists before adding OVS port
Otherwise fail.
Change-Id: Ia84d146e568071a84a7d0e06fcd88e64427904b8
Closes-Bug: #1700745
Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh index 99bae3e87..c91f87172 100644 --- a/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh +++ b/docker/openvswitch/openvswitch-db-server/ovs_ensure_configured.sh @@ -3,8 +3,14 @@ bridge=$1 port=$2 -ovs-vsctl br-exists $bridge; rc=$? -if [[ $rc == 2 ]]; then +ip link show $port +if [[ $? -ne 0 ]]; then + # fail when device doesn't exist + exit 1 +fi + +ovs-vsctl br-exists $bridge +if [[ $? -eq 2 ]]; then changed=changed ovs-vsctl --no-wait add-br $bridge fi |