From 2869544117be3174e5461d74081ba2bf3ab802ce Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Mon, 8 May 2023 18:56:20 -0300 Subject: [PATCH] ipareplica: Removed unused parameter _ca_file Remove parameter _ca_file from ipareplica modules as the parameter is not used. Related to: https://github.com/freeipa/freeipa/pull/6620 --- .../library/ipareplica_custodia_import_dm_password.py | 5 ----- roles/ipareplica/library/ipareplica_ds_apply_updates.py | 5 ----- roles/ipareplica/library/ipareplica_ds_enable_ssl.py | 5 ----- roles/ipareplica/library/ipareplica_krb_enable_ssl.py | 5 ----- roles/ipareplica/library/ipareplica_restart_kdc.py | 5 ----- roles/ipareplica/library/ipareplica_setup_ca.py | 5 ----- roles/ipareplica/library/ipareplica_setup_custodia.py | 5 ----- roles/ipareplica/library/ipareplica_setup_http.py | 5 ----- roles/ipareplica/library/ipareplica_setup_otpd.py | 5 ----- roles/ipareplica/tasks/install.yml | 9 --------- 10 files changed, 54 deletions(-) diff --git a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py index 8c14526cb4..64e867cd05 100644 --- a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py +++ b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py @@ -68,10 +68,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _kra_enabled: description: The installer _kra_enabled setting type: bool @@ -134,7 +130,6 @@ def main(): # additional ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _kra_enabled=dict(required=False, type='bool'), _kra_host_name=dict(required=False, type='str'), _top_dir=dict(required=True, type='str'), diff --git a/roles/ipareplica/library/ipareplica_ds_apply_updates.py b/roles/ipareplica/library/ipareplica_ds_apply_updates.py index 44ec5285f3..31ad21db47 100644 --- a/roles/ipareplica/library/ipareplica_ds_apply_updates.py +++ b/roles/ipareplica/library/ipareplica_ds_apply_updates.py @@ -78,10 +78,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _dirsrv_pkcs12_info: description: The installer _dirsrv_pkcs12_info setting type: list @@ -140,7 +136,6 @@ def main(): config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _dirsrv_pkcs12_info=dict(required=False, type='list', elements='str'), _pkinit_pkcs12_info=dict(required=False, type='list', diff --git a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py index 74742fff07..ca90eea627 100644 --- a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py +++ b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py @@ -74,10 +74,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _dirsrv_pkcs12_info: description: The installer _dirsrv_pkcs12_info setting type: list @@ -135,7 +131,6 @@ def main(): config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _dirsrv_pkcs12_info=dict(required=False, type='list', elements='str'), _pkinit_pkcs12_info=dict(required=False, type='list', diff --git a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py index 589eb46b08..1cb48b095d 100644 --- a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py +++ b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py @@ -68,10 +68,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _pkinit_pkcs12_info: description: The installer _pkinit_pkcs12_info setting type: list @@ -119,7 +115,6 @@ def main(): config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _pkinit_pkcs12_info=dict(required=False, type='list', elements='str'), _top_dir=dict(required=True, type='str'), diff --git a/roles/ipareplica/library/ipareplica_restart_kdc.py b/roles/ipareplica/library/ipareplica_restart_kdc.py index 603ec9a307..002eac2df2 100644 --- a/roles/ipareplica/library/ipareplica_restart_kdc.py +++ b/roles/ipareplica/library/ipareplica_restart_kdc.py @@ -68,10 +68,6 @@ description: The local ccache type: str required: yes - _ca_file: - description: The installer _ca_file setting - type: str - required: no _top_dir: description: The installer _top_dir setting type: str @@ -115,7 +111,6 @@ def main(): # additional config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), - _ca_file=dict(required=False, type='str'), _top_dir=dict(required=True, type='str'), dirman_password=dict(required=True, type='str', no_log=True), ), diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py index cbecd797c6..f094c43b66 100644 --- a/roles/ipareplica/library/ipareplica_setup_ca.py +++ b/roles/ipareplica/library/ipareplica_setup_ca.py @@ -68,10 +68,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _kra_enabled: description: The installer _kra_enabled setting type: bool @@ -163,7 +159,6 @@ def main(): # additional ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _kra_enabled=dict(required=False, type='bool'), _kra_host_name=dict(required=False, type='str'), _dirsrv_pkcs12_info=dict(required=False, type='list', diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py index 09ab172109..ad649b9800 100644 --- a/roles/ipareplica/library/ipareplica_setup_custodia.py +++ b/roles/ipareplica/library/ipareplica_setup_custodia.py @@ -72,10 +72,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _kra_enabled: description: The installer _kra_enabled setting type: bool @@ -131,7 +127,6 @@ def main(): config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _kra_enabled=dict(required=False, type='bool'), _kra_host_name=dict(required=False, type='str'), _pkinit_pkcs12_info=dict(required=False, type='list', diff --git a/roles/ipareplica/library/ipareplica_setup_http.py b/roles/ipareplica/library/ipareplica_setup_http.py index e14ae2e948..bc5c430c2c 100644 --- a/roles/ipareplica/library/ipareplica_setup_http.py +++ b/roles/ipareplica/library/ipareplica_setup_http.py @@ -76,10 +76,6 @@ description: The installer _ca_enabled setting type: bool required: no - _ca_file: - description: The installer _ca_file setting - type: str - required: no _http_pkcs12_info: description: The installer _http_pkcs12_info setting type: list @@ -129,7 +125,6 @@ def main(): config_ca_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), _ca_enabled=dict(required=False, type='bool'), - _ca_file=dict(required=False, type='str'), _http_pkcs12_info=dict(required=False, type='list', elements='str'), _top_dir=dict(required=True, type='str'), diff --git a/roles/ipareplica/library/ipareplica_setup_otpd.py b/roles/ipareplica/library/ipareplica_setup_otpd.py index 3080f3e7ca..cf5a881a22 100644 --- a/roles/ipareplica/library/ipareplica_setup_otpd.py +++ b/roles/ipareplica/library/ipareplica_setup_otpd.py @@ -68,10 +68,6 @@ description: The local ccache type: str required: yes - _ca_file: - description: The installer _ca_file setting - type: str - required: no _top_dir: description: The installer _top_dir setting type: str @@ -114,7 +110,6 @@ def main(): # additional config_master_host_name=dict(required=True, type='str'), ccache=dict(required=True, type='str'), - _ca_file=dict(required=False, type='str'), _top_dir=dict(required=True, type='str'), dirman_password=dict(required=True, type='str', no_log=True), ), diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml index b718ed0c08..187e9b50ec 100644 --- a/roles/ipareplica/tasks/install.yml +++ b/roles/ipareplica/tasks/install.yml @@ -418,7 +418,6 @@ "{{ result_ipareplica_install_ca_certs.config_master_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info if result_ipareplica_prepare._dirsrv_pkcs12_info != None else omit }}" _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info if result_ipareplica_prepare._pkinit_pkcs12_info != None else omit }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" @@ -440,7 +439,6 @@ config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info if result_ipareplica_prepare._http_pkcs12_info != None else omit }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -495,7 +493,6 @@ config_master_host_name: "{{ result_ipareplica_install_ca_certs.config_master_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -515,7 +512,6 @@ _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}" _kra_host_name: "{{ result_ipareplica_prepare.config_kra_host_name }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info if result_ipareplica_prepare._pkinit_pkcs12_info != None else omit }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -533,7 +529,6 @@ ### additional ### ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_subject: "{{ result_ipareplica_prepare._ca_subject }}" _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}" _kra_host_name: "{{ result_ipareplica_prepare.config_kra_host_name }}" @@ -563,7 +558,6 @@ "{{ result_ipareplica_install_ca_certs.config_master_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info if result_ipareplica_prepare._pkinit_pkcs12_info != None else omit }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -583,7 +577,6 @@ "{{ result_ipareplica_install_ca_certs.config_master_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info if result_ipareplica_prepare._pkinit_pkcs12_info != None else omit }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -642,7 +635,6 @@ config_master_host_name: "{{ result_ipareplica_install_ca_certs.config_master_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}" dirman_password: "{{ __derived_dirman_password }}" @@ -661,7 +653,6 @@ config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" ccache: "{{ result_ipareplica_prepare.ccache }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" - _ca_file: "{{ result_ipareplica_prepare._ca_file }}" _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}" _kra_host_name: "{{ result_ipareplica_prepare.config_kra_host_name }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}"