From ffd8585d19a8ac2459f9519141ef50e5b9521254 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 2 Apr 2020 10:48:53 +0200
Subject: [PATCH] ipareplica_setup_kra: Remove unused ccache parameter
The installer_ccache parameter is used in the module. The ccache parameter
was only set, but not used at all.
---
roles/ipareplica/library/ipareplica_setup_kra.py | 8 --------
roles/ipareplica/tasks/install.yml | 1 -
2 files changed, 9 deletions(-)
diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py
index 8e7b5f6f..3149c104 100644
--- a/roles/ipareplica/library/ipareplica_setup_kra.py
+++ b/roles/ipareplica/library/ipareplica_setup_kra.py
@@ -96,9 +96,6 @@ options:
config_master_host_name:
description: The config master_host_name setting
required: no
- ccache:
- description: The local ccache
- required: no
installer_ccache:
description: The installer ccache setting
required: no
@@ -172,7 +169,6 @@ def main():
# additional
server=dict(required=True),
config_master_host_name=dict(required=True),
- ccache=dict(required=True),
installer_ccache=dict(required=True),
_ca_enabled=dict(required=False, type='bool'),
_kra_enabled=dict(required=False, type='bool'),
@@ -232,8 +228,6 @@ def main():
# additional
options.server = ansible_module.params.get('server')
master_host_name = ansible_module.params.get('config_master_host_name')
- ccache = ansible_module.params.get('ccache')
- # os.environ['KRB5CCNAME'] = ccache
os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
installer._ccache = ansible_module.params.get('installer_ccache')
ca_enabled = ansible_module.params.get('_ca_enabled')
@@ -268,8 +262,6 @@ def main():
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- # ccache = os.environ['KRB5CCNAME']
-
with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL KRA --")
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 3345beba..fe81a4d1 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -606,7 +606,6 @@
server: "{{ result_ipareplica_test.server }}"
config_master_host_name:
"{{ result_ipareplica_prepare.config_master_host_name }}"
- ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
--
GitLab