mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-03-26 21:33:05 +00:00
Merge pull request #1208 from t-woerner/ipaclient_automount_with_new_install_states
ipaclient_setup_automount with new install states
This commit is contained in:
@@ -68,7 +68,8 @@ RETURN = '''
|
||||
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.ansible_ipa_client import (
|
||||
setup_logging, check_imports, options, configure_automount
|
||||
setup_logging, check_imports, options, configure_automount, sysrestore,
|
||||
paths, getargspec
|
||||
)
|
||||
|
||||
|
||||
@@ -94,10 +95,23 @@ def main():
|
||||
options.automount_location = module.params.get('automount_location')
|
||||
options.location = options.automount_location
|
||||
|
||||
changed = False
|
||||
if options.automount_location:
|
||||
configure_automount(options)
|
||||
changed = True
|
||||
argspec = getargspec(configure_automount)
|
||||
if len(argspec.args) > 1:
|
||||
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
|
||||
statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE)
|
||||
|
||||
module.exit_json(changed=True)
|
||||
configure_automount(options, statestore)
|
||||
|
||||
# Reload the state as automount install may have modified it
|
||||
fstore._load()
|
||||
statestore._load()
|
||||
else:
|
||||
configure_automount(options)
|
||||
|
||||
module.exit_json(changed=changed)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user