Merge pull request #4697 from privateip/nxos_config
updates nxos_config to remove state argument
This commit is contained in:
commit
74ae5a6257
1 changed files with 2 additions and 26 deletions
|
@ -157,16 +157,6 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: false
|
default: false
|
||||||
version_added: "2.2"
|
version_added: "2.2"
|
||||||
state:
|
|
||||||
description:
|
|
||||||
- The I(state) argument specifies the state of the config
|
|
||||||
file on the device. When set to present, the configuration
|
|
||||||
is updated based on the values of the module. When the value
|
|
||||||
is set to absent, the device startup config is erased.
|
|
||||||
required: true
|
|
||||||
default: present
|
|
||||||
choices: ['present', 'absent']
|
|
||||||
version_added: "2.2"
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
@ -223,11 +213,6 @@ from ansible.module_utils.netcfg import NetworkConfig, dumps
|
||||||
from ansible.module_utils.nxos import NetworkModule, NetworkError
|
from ansible.module_utils.nxos import NetworkModule, NetworkError
|
||||||
from ansible.module_utils.basic import get_exception
|
from ansible.module_utils.basic import get_exception
|
||||||
|
|
||||||
def invoke(name, *args, **kwargs):
|
|
||||||
func = globals().get(name)
|
|
||||||
if func:
|
|
||||||
return func(*args, **kwargs)
|
|
||||||
|
|
||||||
def check_args(module, warnings):
|
def check_args(module, warnings):
|
||||||
if module.params['save'] and module.check_mode:
|
if module.params['save'] and module.check_mode:
|
||||||
warnings.append('will not save configuration due to checkmode')
|
warnings.append('will not save configuration due to checkmode')
|
||||||
|
@ -287,7 +272,7 @@ def load_checkpoint(module, result):
|
||||||
msg = 'unable to rollback configuration'
|
msg = 'unable to rollback configuration'
|
||||||
module.fail_json(msg=msg, checkpoint=checkpoint, **exc.kwargs)
|
module.fail_json(msg=msg, checkpoint=checkpoint, **exc.kwargs)
|
||||||
|
|
||||||
def present(module, result):
|
def run(module, result):
|
||||||
match = module.params['match']
|
match = module.params['match']
|
||||||
replace = module.params['replace']
|
replace = module.params['replace']
|
||||||
update = module.params['update']
|
update = module.params['update']
|
||||||
|
@ -328,11 +313,6 @@ def present(module, result):
|
||||||
module.config.save_config()
|
module.config.save_config()
|
||||||
result['changed'] = True
|
result['changed'] = True
|
||||||
|
|
||||||
def absent(module, result):
|
|
||||||
if not module.check_mode:
|
|
||||||
module.cli('write erase')
|
|
||||||
result['changed'] = True
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
""" main entry point for module execution
|
""" main entry point for module execution
|
||||||
"""
|
"""
|
||||||
|
@ -360,8 +340,6 @@ def main():
|
||||||
defaults=dict(type='bool', default=False),
|
defaults=dict(type='bool', default=False),
|
||||||
|
|
||||||
save=dict(type='bool', default=False),
|
save=dict(type='bool', default=False),
|
||||||
|
|
||||||
state=dict(default='present', choices=['absent', 'present'])
|
|
||||||
)
|
)
|
||||||
|
|
||||||
mutually_exclusive = [('lines', 'src')]
|
mutually_exclusive = [('lines', 'src')]
|
||||||
|
@ -371,8 +349,6 @@ def main():
|
||||||
mutually_exclusive=mutually_exclusive,
|
mutually_exclusive=mutually_exclusive,
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
state = module.params['state']
|
|
||||||
|
|
||||||
if module.params['force'] is True:
|
if module.params['force'] is True:
|
||||||
module.params['match'] = 'none'
|
module.params['match'] = 'none'
|
||||||
|
|
||||||
|
@ -382,7 +358,7 @@ def main():
|
||||||
result = dict(changed=False, warnings=warnings)
|
result = dict(changed=False, warnings=warnings)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
invoke(state, module, result)
|
run(module, result)
|
||||||
except NetworkError:
|
except NetworkError:
|
||||||
load_checkpoint(module, result)
|
load_checkpoint(module, result)
|
||||||
exc = get_exception()
|
exc = get_exception()
|
||||||
|
|
Loading…
Reference in a new issue