From ca4518a623ac01ada24cac5d81d604130c7cfcf1 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 21 Jun 2019 11:58:57 +0200
Subject: [PATCH] ansible_ipa_client: Always set options.unattended
This has not been done so far in the ansible_ipa_client, but only in the
modules where it was really needed. But as these places are getting more
with 4.7.90, this setting makes it into the module_utils.
---
roles/ipaclient/library/ipaclient_fix_ca.py | 1 -
roles/ipaclient/library/ipaclient_join.py | 1 -
roles/ipaclient/library/ipaclient_test.py | 1 -
roles/ipaclient/module_utils/ansible_ipa_client.py | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/roles/ipaclient/library/ipaclient_fix_ca.py b/roles/ipaclient/library/ipaclient_fix_ca.py
index 8e8794b8..6e4b2bcb 100644
--- a/roles/ipaclient/library/ipaclient_fix_ca.py
+++ b/roles/ipaclient/library/ipaclient_fix_ca.py
@@ -90,7 +90,6 @@ def main():
os.environ['KRB5CCNAME'] = paths.IPA_DNS_CCACHE
options.ca_cert_file = None
- options.unattended = True
options.principal = None
options.force = False
options.password = None
diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py
index 7057b5f6..3a2cbc3f 100644
--- a/roles/ipaclient/library/ipaclient_join.py
+++ b/roles/ipaclient/library/ipaclient_join.py
@@ -180,7 +180,6 @@ def main():
sssd = True
options.ca_cert_file = ca_cert_file
- options.unattended = True
options.principal = principal
options.force = False
options.password = password
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index bc4d4efc..3d6f4b65 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -413,7 +413,6 @@ def main():
# root_logger
options.debug = False
- options.unattended = not installer.interactive
if options.domain_name:
options.domain = normalize_hostname(installer.domain_name)
else:
diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
index 9a956f6a..bf7a6184 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -64,6 +64,7 @@ installer = installer_obj()
# Create options
options = installer
options.interactive = False
+options.unattended = not options.interactive
if NUM_VERSION >= 40400:
# IPA version >= 4.4
--
GitLab