diff options
author | Ganesh Nalawade <ganesh634@gmail.com> | 2019-03-07 13:52:36 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-07 13:52:36 +0530 |
commit | 7a36c7ae2e8ff22c859f80a11e3e4f7c497c9eb1 (patch) | |
tree | e88d27be3aad4b9dd42a89a10e144f4fce2281e1 /lib/ansible/plugins/terminal | |
parent | be3fe8f364a495344cf02da7bb99b3c934695880 (diff) | |
download | ansible-7a36c7ae2e8ff22c859f80a11e3e4f7c497c9eb1.tar.gz |
Fix junos terminal regex for cluster srx devices (#53006)
* Fix junos terminal regex for cluster srx devices
Fixes #50726
* Modify junos terminal regex to match for
string `{primary:node0}` which is also part of the
prompt.
* Modify network_cli connection plugin to ignore
multiple prompt matched lines.
* Fix review comment
Diffstat (limited to 'lib/ansible/plugins/terminal')
-rw-r--r-- | lib/ansible/plugins/terminal/junos.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/plugins/terminal/junos.py b/lib/ansible/plugins/terminal/junos.py index 735e8bdf37..8562581156 100644 --- a/lib/ansible/plugins/terminal/junos.py +++ b/lib/ansible/plugins/terminal/junos.py @@ -32,7 +32,7 @@ display = Display() class TerminalModule(TerminalBase): terminal_stdout_re = [ - re.compile(br"[\r\n]?[\w@+\-\.:\/\[\]]+[>#%] ?$"), + re.compile(br"({primary:node\d+})?[\r\n]?[\w@+\-\.:\/\[\]]+[>#%] ?$"), ] terminal_stderr_re = [ |