Merge "Fix py3 compat for regex searches in YAML validate"
This commit is contained in:
commit
ef859797e4
@ -910,7 +910,7 @@ def validate_service_hiera_interpol(f, tpl):
|
||||
# name. The only exception is allow anything under
|
||||
# str_replace['params'] ('str_replace;params' in the str notation).
|
||||
# We need to escape because of '$' char may be in templated params.
|
||||
query = re.compile(r'\\;str\\_replace\\;params\\;\S*?net',
|
||||
query = re.compile(r'\\;str(\\)?_replace\\;params\\;\S*?net',
|
||||
re.IGNORECASE)
|
||||
if not query.search(re.escape(path_str)):
|
||||
# Keep parsing, if foo_vip_network, or anything
|
||||
|
Loading…
x
Reference in New Issue
Block a user