Raise an error if ansible_network_os is not specified (#30429)
This commit is contained in:
parent
f87d0b3502
commit
5d404af76e
1 changed files with 5 additions and 8 deletions
|
@ -21,6 +21,7 @@ import sys
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from ansible import constants as C
|
from ansible import constants as C
|
||||||
|
from ansible.errors import AnsibleError
|
||||||
from ansible.plugins.action import ActionBase
|
from ansible.plugins.action import ActionBase
|
||||||
from ansible.module_utils.network_common import load_provider
|
from ansible.module_utils.network_common import load_provider
|
||||||
|
|
||||||
|
@ -138,21 +139,17 @@ class ActionModule(ActionBase):
|
||||||
return socket_path
|
return socket_path
|
||||||
|
|
||||||
def _get_network_os(self, task_vars):
|
def _get_network_os(self, task_vars):
|
||||||
if ('network_os' in self._task.args and self._task.args['network_os']):
|
if 'network_os' in self._task.args and self._task.args['network_os']:
|
||||||
display.vvvv('Getting network OS from task argument')
|
display.vvvv('Getting network OS from task argument')
|
||||||
network_os = self._task.args['network_os']
|
network_os = self._task.args['network_os']
|
||||||
elif (self._play_context.network_os):
|
elif self._play_context.network_os:
|
||||||
display.vvvv('Getting network OS from inventory')
|
display.vvvv('Getting network OS from inventory')
|
||||||
network_os = self._play_context.network_os
|
network_os = self._play_context.network_os
|
||||||
elif ('network_os' in task_vars['ansible_facts'] and
|
elif 'network_os' in task_vars.get('ansible_facts', {}) and task_vars['ansible_facts']['network_os']:
|
||||||
task_vars['ansible_facts']['network_os']):
|
|
||||||
display.vvvv('Getting network OS from fact')
|
display.vvvv('Getting network OS from fact')
|
||||||
network_os = task_vars['ansible_facts']['network_os']
|
network_os = task_vars['ansible_facts']['network_os']
|
||||||
else:
|
else:
|
||||||
# this will be replaced by the call to get_capabilities() on the
|
raise AnsibleError('ansible_network_os must be specified on this host to use platform agnostic modules')
|
||||||
# connection
|
|
||||||
display.vvvv('Getting network OS from net discovery')
|
|
||||||
network_os = None
|
|
||||||
|
|
||||||
return network_os
|
return network_os
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue