Skip to content
Snippets Groups Projects
Commit 127d7581 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

ipareplica_install_ca_certs: Do not return unchanged config attributes

The config attributes config_master_host_name and also config_ca_host_name
are not changed within ipareplica_install_ca_certs, therefore it is not
needed to return them and also to use the returned values for following
tasks.
parent 4ff6e35c
Branches
Tags
No related merge requests found
...@@ -333,9 +333,7 @@ def main(): ...@@ -333,9 +333,7 @@ def main():
# done # # done #
ansible_module.exit_json(changed=True, ansible_module.exit_json(changed=True)
config_master_host_name=config.master_host_name,
config_ca_host_name=config.ca_host_name)
if __name__ == '__main__': if __name__ == '__main__':
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
dirman_password: "{{ __derived_dirman_password }}" dirman_password: "{{ __derived_dirman_password }}"
config_setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}" config_setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}"
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}"
config_ips: "{{ result_ipareplica_prepare.config_ips }}" config_ips: "{{ result_ipareplica_prepare.config_ips }}"
register: result_ipareplica_setup_ds register: result_ipareplica_setup_ds
...@@ -339,7 +339,7 @@ ...@@ -339,7 +339,7 @@
### additional ### ### additional ###
server: "{{ result_ipareplica_test.server }}" server: "{{ result_ipareplica_test.server }}"
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}" installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info if result_ipareplica_prepare._pkinit_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 }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}"
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
### additional ### ### additional ###
server: "{{ result_ipareplica_test.server }}" server: "{{ result_ipareplica_test.server }}"
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}" installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
dirman_password: "{{ __derived_dirman_password }}" dirman_password: "{{ __derived_dirman_password }}"
setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}" setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}"
master: master:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
when: result_ipareplica_test.change_master_for_certmonger when: result_ipareplica_test.change_master_for_certmonger
- name: Install - DS enable SSL - name: Install - DS enable SSL
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_file: "{{ result_ipareplica_prepare._ca_file }}"
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
### additional ### ### additional ###
server: "{{ result_ipareplica_test.server }}" server: "{{ result_ipareplica_test.server }}"
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}" config_ca_host_name: "{{ result_ipareplica_prepare.config_ca_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}" installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
...@@ -498,7 +498,7 @@ ...@@ -498,7 +498,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_file: "{{ result_ipareplica_prepare._ca_file }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}"
...@@ -549,9 +549,9 @@ ...@@ -549,9 +549,9 @@
dirman_password: "{{ __derived_dirman_password }}" dirman_password: "{{ __derived_dirman_password }}"
config_setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}" config_setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}"
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
config_ca_host_name: config_ca_host_name:
"{{ result_ipareplica_install_ca_certs.config_ca_host_name }}" "{{ result_ipareplica_prepare.config_ca_host_name }}"
config_ips: "{{ result_ipareplica_prepare.config_ips }}" config_ips: "{{ result_ipareplica_prepare.config_ips }}"
when: result_ipareplica_prepare._ca_enabled when: result_ipareplica_prepare._ca_enabled
...@@ -565,7 +565,7 @@ ...@@ -565,7 +565,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_file: "{{ result_ipareplica_prepare._ca_file }}"
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}" _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_file: "{{ result_ipareplica_prepare._ca_file }}"
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
subject_base: "{{ result_ipareplica_prepare.subject_base }}" subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ### ### additional ###
config_master_host_name: config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}" "{{ result_ipareplica_prepare.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}" _ca_file: "{{ result_ipareplica_prepare._ca_file }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment