diff options
author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
---|---|---|
committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
commit | a818c745c457b88cb453e06a78e6e3ead470c1d1 (patch) | |
tree | 8d97cfbbc663ff7c18fbe992ad84d5f11d04ab12 | |
parent | 546f424a7f02f800639c947068b1feda7ff57e59 (diff) | |
parent | e660c36e61764c2236ddc8c45d8ffe95a16f2e39 (diff) | |
download | vyos-cloud-init-a818c745c457b88cb453e06a78e6e3ead470c1d1.tar.gz vyos-cloud-init-a818c745c457b88cb453e06a78e6e3ead470c1d1.zip |
merge trunk at 0.7.7~bzr1209
-rw-r--r-- | cloudinit/net/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py index 31110292..a765b75a 100644 --- a/cloudinit/net/__init__.py +++ b/cloudinit/net/__init__.py @@ -646,6 +646,8 @@ def generate_fallback_config(): connected = [] possibly_connected = [] for interface in potential_interfaces: + if interface.startswith("veth"): + continue if os.path.exists(sys_dev_path(interface, "bridge")): # skip any bridges continue |