From 6482a0d1c395cb154f836c8c4353e27d380cca3d Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 5 Oct 2017 10:39:43 +0200
Subject: [PATCH] library/ipatest.py: Drop unused prinipal from module
parameters
The principal is not used and needed in the module, therefore it got removed.
---
library/ipatest.py | 7 -------
roles/ipaclient/tasks/install.yml | 1 -
2 files changed, 8 deletions(-)
diff --git a/library/ipatest.py b/library/ipatest.py
index 34af123e..2d8304ea 100644
--- a/library/ipatest.py
+++ b/library/ipatest.py
@@ -51,9 +51,6 @@ options:
kdc:
description: The name or address of the host running the KDC.
required: true
- principal:
- description: The authorized kerberos principal used to join the IPA realm.
- required: false
kinit_attempts:
description: Repeat the request for host Kerberos ticket X times.
required: false
@@ -71,7 +68,6 @@ EXAMPLES = '''
realm: EXAMPLE.COM
kdc: server1.example.com
hostname: client1.example.com
- principal: admin
kinit_attempts: 5
# Join IPA to get the keytab using ipadiscovery return values
@@ -82,7 +78,6 @@ EXAMPLES = '''
realm: "{{ ipadiscovery.realm }}"
kdc: "{{ ipadiscovery.kdc }}"
hostname: "{{ ipadiscovery.hostname }}"
- principal: admin
'''
RETURN = '''
@@ -176,7 +171,6 @@ def main():
realm=dict(required=True),
hostname=dict(required=True),
kdc=dict(required=True),
- principal=dict(required=False),
kinit_attempts=dict(required=False, type='int', default=5),
),
supports_check_mode = True,
@@ -188,7 +182,6 @@ def main():
realm = module.params.get('realm')
hostname = module.params.get('hostname')
kdc = module.params.get('kdc')
- principal = module.params.get('principal')
kinit_attempts = module.params.get('kinit_attempts')
client_domain = hostname[hostname.find(".")+1:]
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index bcfb08e5..fd6b55d6 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -35,7 +35,6 @@
realm: "{{ ipadiscovery.realm }}"
hostname: "{{ ipadiscovery.hostname }}"
kdc: "{{ ipadiscovery.kdc }}"
- principal: "{{ ipaadmin_principal if not ipaclient_use_otp | bool else '' }}"
kinit_attempts: "{{ ipaclient_kinit_attempts | default(omit) }}"
register: ipatest
--
GitLab