Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipaclient_setup_automount with new install states #1208

Merged
merged 2 commits into from Feb 7, 2024
Merged

ipaclient_setup_automount with new install states #1208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a468d3
ipaclient_setup_automount with new install states
t-woerner Feb 7, 2024
0d1f8b5
ipaclient_setup_automount: Only return changed if there was a change
t-woerner Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions roles/ipaclient/library/ipaclient_setup_automount.py
View file
Open in desktop
Expand Up @@ -68,7 +68,8 @@

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
)


Expand All @@ -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__':
Expand Down