Skip to content

Commit

Permalink
ipaclient_setup_automount with new install states
Browse files Browse the repository at this point in the history
This is "Fix ipa-client-automount install/uninstall with new install
states" freeipa/freeipa#7100 for ansible-freeipa:

Issue 8384 introduced a new installation state for the statestore
to identify when client/server installation is completely finished
rather than relying on has_files().

The problem is that ipa-client-automount may be called during
ipa-client-install and since installation is not complete at that
point the automount install was failing with "IPA client not
configured".

Add a new state, 'automount', to designate that automount installation
is in process. If check_client_configuration() fails it checks to
see if [installation] automount is True. If so it continues with the
installation.

This also addresses an issue where the filestore and statestore are
shared between the client and automount installers but the client
wasn't refreshing state after automount completed. This resulted in
an incomplete state and index file of backed-up files which caused
files to not be restored on uninstall and the state file to be
orphaned.

Fixes: https://pagure.io/freeipa/issue/9487
  • Loading branch information
t-woerner committed Feb 7, 2024
1 parent 1028f61 commit f7caaff
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions roles/ipaclient/library/ipaclient_setup_automount.py
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

0 comments on commit f7caaff

Please sign in to comment.