Commit 90402786 authored by Klaus Aehlig's avatar Klaus Aehlig

Merge branch 'stable-2.8' into stable-2.9

* stable-2.8
  Fix expression describing optional parameters
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarJose A. Lopes <jabolopes@google.com>
parents 6386c546 ad55b2d4
......@@ -2233,7 +2233,7 @@ class SerializableConfigParser(ConfigParser.SafeConfigParser, object):
if value.lower() == constants.VALUE_NONE:
value = None
except ConfigParser.NoOptionError:
r = re.compile(r"(disk|nic)\d+_name")
r = re.compile(r"(disk|nic)\d+_name|nic\d+_(network|vlan)")
match = r.match(option)
if match:
pass
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment