diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-31 12:11:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-31 12:11:12 +0000 |
| commit | a04bd8d29ef8f2edb775844469be8ba600cf02b0 (patch) | |
| tree | f30d9a4cb7cd4e6bb741563368c224b5eff602f5 /docker | |
| parent | 7b3e9c595cd5a3d838ba6178711356f45e4e5f25 (diff) | |
| parent | 4489bf24d84dc8a4a2489e65117a55857c0b8ade (diff) | |
| download | kolla-a04bd8d29ef8f2edb775844469be8ba600cf02b0.tar.gz kolla-a04bd8d29ef8f2edb775844469be8ba600cf02b0.zip | |
Merge "Ensure interface exists before adding OVS port"
Diffstat (limited to 'docker')
| -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 |