|
 |
b01884 |
From c5cdd5a5f01306b3a70354d34079efe64565aa69 Mon Sep 17 00:00:00 2001
|
|
|
b01884 |
From: Thomas Woerner <twoerner@redhat.com>
|
|
|
b01884 |
Date: Thu, 9 Aug 2018 12:05:26 +0200
|
|
|
b01884 |
Subject: ipaclient: Remove --no-sssd and --no-ac options
|
|
|
b01884 |
|
|
|
b01884 |
Client installation with --no-sssd option has already beeen deprecated
|
|
|
b01884 |
with https://pagure.io/freeipa/issue/5860. Authconfig support has been
|
|
|
b01884 |
removed, therefore --no-ac option can be removed also.
|
|
|
b01884 |
|
|
|
b01884 |
ipatests/test_integration/test_authselect.py: Skip no_sssd and no_ac tests.
|
|
|
b01884 |
|
|
|
b01884 |
See: https://pagure.io/freeipa/issue/7671
|
|
|
b01884 |
Signed-off-by: Thomas Woerner <twoerner@redhat.com>
|
|
|
b01884 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
b01884 |
---
|
|
|
b01884 |
ipaclient/install/client.py | 6 +-----
|
|
|
b01884 |
ipaclient/install/sssd.py | 9 +--------
|
|
|
b01884 |
ipatests/test_integration/test_authselect.py | 2 ++
|
|
|
b01884 |
3 files changed, 4 insertions(+), 13 deletions(-)
|
|
|
b01884 |
|
|
|
b01884 |
diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
|
|
|
b01884 |
index 627351ac2..800a46734 100644
|
|
|
b01884 |
--- a/ipaclient/install/client.py
|
|
|
b01884 |
+++ b/ipaclient/install/client.py
|
|
|
b01884 |
@@ -3709,11 +3709,7 @@ class ClientInstall(ClientInstallInterface,
|
|
|
b01884 |
def prompt_password(self):
|
|
|
b01884 |
return self.interactive
|
|
|
b01884 |
|
|
|
b01884 |
- no_ac = knob(
|
|
|
b01884 |
- None,
|
|
|
b01884 |
- description="do not modify the nsswitch.conf and PAM configuration",
|
|
|
b01884 |
- cli_names='--noac',
|
|
|
b01884 |
- )
|
|
|
b01884 |
+ no_ac = False
|
|
|
b01884 |
|
|
|
b01884 |
force = knob(
|
|
|
b01884 |
None,
|
|
|
b01884 |
diff --git a/ipaclient/install/sssd.py b/ipaclient/install/sssd.py
|
|
|
b01884 |
index b20abde56..98b850464 100644
|
|
|
b01884 |
--- a/ipaclient/install/sssd.py
|
|
|
b01884 |
+++ b/ipaclient/install/sssd.py
|
|
|
b01884 |
@@ -43,11 +43,4 @@ class SSSDInstallInterface(service.ServiceInstallInterface):
|
|
|
b01884 |
)
|
|
|
b01884 |
preserve_sssd = enroll_only(preserve_sssd)
|
|
|
b01884 |
|
|
|
b01884 |
- no_sssd = knob(
|
|
|
b01884 |
- None,
|
|
|
b01884 |
- deprecated=True,
|
|
|
b01884 |
- description="Do not configure the client to use SSSD for "
|
|
|
b01884 |
- "authentication",
|
|
|
b01884 |
- cli_names=[None, '-S'],
|
|
|
b01884 |
- )
|
|
|
b01884 |
- no_sssd = enroll_only(no_sssd)
|
|
|
b01884 |
+ no_sssd = False
|
|
|
b01884 |
diff --git a/ipatests/test_integration/test_authselect.py b/ipatests/test_integration/test_authselect.py
|
|
|
b01884 |
index fa9b20265..ebf3d9892 100644
|
|
|
b01884 |
--- a/ipatests/test_integration/test_authselect.py
|
|
|
b01884 |
+++ b/ipatests/test_integration/test_authselect.py
|
|
|
b01884 |
@@ -88,6 +88,7 @@ class TestClientInstallation(IntegrationTest):
|
|
|
b01884 |
['ipa-client-install', '--uninstall', '-U'],
|
|
|
b01884 |
raiseonerr=False)
|
|
|
b01884 |
|
|
|
b01884 |
+ @pytest.mark.skip(reason="Option --no-sssd has been removed")
|
|
|
b01884 |
def test_install_client_no_sssd(self):
|
|
|
b01884 |
"""
|
|
|
b01884 |
Test client installation with --no-sssd option.
|
|
|
b01884 |
@@ -98,6 +99,7 @@ class TestClientInstallation(IntegrationTest):
|
|
|
b01884 |
msg = "Option '--no-sssd' is incompatible with the 'authselect' tool"
|
|
|
b01884 |
assert msg in result.stderr_text
|
|
|
b01884 |
|
|
|
b01884 |
+ @pytest.mark.skip(reason="Option --noac has been removed")
|
|
|
b01884 |
def test_install_client_no_ac(self):
|
|
|
b01884 |
"""
|
|
|
b01884 |
Test client installation with --noac option.
|
|
|
b01884 |
--
|
|
|
b01884 |
2.17.1
|
|
|
b01884 |
|