ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-05 05:34:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

roll up of vyos action fixes (#21642)

Browse source 
* check cli context is not in config mode
* add display messages for more details
This commit is contained in:
Peter Sprygada 2017-02-19 17:37:16 -05:00 • committed by GitHub
commit ce9180b3a1
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/plugins/action/vyos.py
View file

@ -62,19 +62,24 @@ class ActionModule(_ActionModule):
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)
socket_path = self._get_socket_path(pc) socket_path = self._get_socket_path(pc)
display.vvvv('socket_path: %s' % socket_path, pc.remote_addr)
if not os.path.exists(socket_path): if not os.path.exists(socket_path):
# start the connection if it isn't started # start the connection if it isn't started
rc, out, err = connection.exec_command('open_shell()') rc, out, err = connection.exec_command('open_shell()')
if rc != 0: if rc != 0:
return {'failed': True, 'msg': 'unable to connect to control socket'} return {'failed': True, 'msg': 'unable to connect to control socket'}
else:
# make sure we are in the right cli context which should be
# enable mode and not config module
rc, out, err = connection.exec_command('prompt()')
while str(out).strip().endswith('#'):
display.debug('wrong context, sending exit to device', self._play_context.remote_addr)
connection.exec_command('exit')
rc, out, err = connection.exec_command('prompt()')
task_vars['ansible_socket'] = socket_path task_vars['ansible_socket'] = socket_path
result = super(ActionModule, self).run(tmp, task_vars)
display.vvv('closing cli shell', self._play_context.remote_addr)
connection.exec_command('close_shell()')
return super(ActionModule, self).run(tmp, task_vars) return super(ActionModule, self).run(tmp, task_vars)
def _get_socket_path(self, play_context): def _get_socket_path(self, play_context):