From 55d9ca8215c0ca247f6ed3ade1e2d1f6a696709a Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 29 Jan 2018 17:56:30 +0100
Subject: [PATCH] ipaserver: Use result_ prefix for results

---
 roles/ipaserver/tasks/install.yml | 240 +++++++++++++++---------------
 1 file changed, 120 insertions(+), 120 deletions(-)

diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index b23e1c47..d79ec63f 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -89,7 +89,7 @@
     secondary_rid_base: "{{ ipaserver_secondary_rid_base | default(omit) }}"
 
     ### additional ###
-  register: ipaserver_test
+  register: result_ipaserver_test
 
 
 - block:
@@ -100,11 +100,11 @@
       ipaserver_master_password:
         dm_password: "{{ ipadm_password }}"
         master_password: "{{ ipaserver_master_password | default(omit) }}"
-      register: ipaserver_master_password
+      register: result_ipaserver_master_password
 
     - name: Install - Use new master password
       set_fact:
-        ipaserver_master_password: "{{ ipaserver_master_password.password }}"
+        ipaserver_master_password: "{{ result_ipaserver_master_password.password }}"
 
     when: ipaserver_master_password is undefined
 
@@ -112,24 +112,24 @@
     ipaserver_prepare:
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      ##ip_addresses: "{{ ipaserver_test.ip_addresses }}"
-      reverse_zones: "{{ ipaserver_test.reverse_zones }}"
-      setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-      setup_kra: "{{ ipaserver_test.setup_kra }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      ##ip_addresses: "{{ result_ipaserver_test.ip_addresses }}"
+      reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
+      setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+      setup_kra: "{{ result_ipaserver_test.setup_kra }}"
       setup_dns: "{{ ipaserver_setup_dns }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      no_host_dns: "{{ ipaserver_test.no_host_dns }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
       no_reverse: "{{ ipaserver_no_reverse }}"
       auto_reverse: "{{ ipaserver_auto_reverse }}"
       auto_forwarders: "{{ ipaserver_auto_forwarders }}"
-      #no_pkinit: "{{ ipaserver_test.no_pkinit }}"
-      _hostname_overridden: "{{ ipaserver_test._hostname_overridden }}"
-    register: ipaserver_prepare
+      #no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
+      _hostname_overridden: "{{ result_ipaserver_test._hostname_overridden }}"
+    register: result_ipaserver_prepare
 
   - name: Install - Setup NTP
     ipaserver_setup_ntp:
@@ -140,174 +140,174 @@
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
       #master_password: "{{ ipaserver_master_password }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm | default(omit) }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      #ip_addresses: "{{ ipaserver_test.ip_addresses }}"
-      #reverse_zones: "{{ ipaserver_test.reverse_zones }}"
-      #setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-      #setup_kra: "{{ ipaserver_test.setup_kra }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm | default(omit) }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      #ip_addresses: "{{ result_ipaserver_test.ip_addresses }}"
+      #reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
+      #setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+      #setup_kra: "{{ result_ipaserver_test.setup_kra }}"
       #setup_dns: "{{ ipaserver_setup_dns }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      #no_host_dns: "{{ ipaserver_test.no_host_dns }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      #no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
       dirsrv_config_file: "{{ ipaserver_dirsrv_config_file | default(omit) }}"
       dirsrv_cert_files: "{{ ipaserver_dirsrv_cert_files | default([]) }}"
       external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
       #no_reverse: "{{ ipaserver_no_reverse }}"
       #auto_forwarders: "{{ ipaserver_auto_forwarders }}"
-      no_pkinit: "{{ ipaserver_test.no_pkinit }}"
+      no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
       no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
-      idstart: "{{ ipaserver_test.idstart }}"
-      idmax: "{{ ipaserver_test.idmax }}"
+      idstart: "{{ result_ipaserver_test.idstart }}"
+      idmax: "{{ result_ipaserver_test.idmax }}"
 
   - name: Install - Setup KRB
     ipaserver_setup_krb:
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
       master_password: "{{ ipaserver_master_password }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      #ip_addresses: "{{ ipaserver_test.ip_addresses }}"
-      reverse_zones: "{{ ipaserver_test.reverse_zones }}"
-      setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-      setup_kra: "{{ ipaserver_test.setup_kra }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      #ip_addresses: "{{ result_ipaserver_test.ip_addresses }}"
+      reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
+      setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+      setup_kra: "{{ result_ipaserver_test.setup_kra }}"
       setup_dns: "{{ ipaserver_setup_dns }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      no_host_dns: "{{ ipaserver_test.no_host_dns }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
       external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
       no_reverse: "{{ ipaserver_no_reverse }}"
       auto_forwarders: "{{ ipaserver_auto_forwarders }}"
-      no_pkinit: "{{ ipaserver_test.no_pkinit }}"
+      no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
       no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
-      idstart: "{{ ipaserver_test.idstart }}"
-      idmax: "{{ ipaserver_test.idmax }}"
-      _pkinit_pkcs12_info: "{{ ipaserver_test._pkinit_pkcs12_info }}"
+      idstart: "{{ result_ipaserver_test.idstart }}"
+      idmax: "{{ result_ipaserver_test.idmax }}"
+      _pkinit_pkcs12_info: "{{ result_ipaserver_test._pkinit_pkcs12_info }}"
 
   - name: Install - Setup CA
     ipaserver_setup_ca:
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
       master_password: "{{ ipaserver_master_password }}"
-      #ip_addresses: "{{ ipaserver_test.ip_addresses }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      no_host_dns: "{{ ipaserver_test.no_host_dns }}"
-      setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-      setup_kra: "{{ ipaserver_test.setup_kra }}"
+      #ip_addresses: "{{ result_ipaserver_test.ip_addresses }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
+      setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+      setup_kra: "{{ result_ipaserver_test.setup_kra }}"
       setup_dns: "{{ ipaserver_setup_dns }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      idstart: "{{ ipaserver_test.idstart }}"
-      idmax: "{{ ipaserver_test.idmax }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      idstart: "{{ result_ipaserver_test.idstart }}"
+      idmax: "{{ result_ipaserver_test.idmax }}"
       no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
-      no_pkinit: "{{ ipaserver_test.no_pkinit }}"
+      no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
       dirsrv_config_file: "{{ ipaserver_dirsrv_config_file | default(omit) }}"
       dirsrv_cert_files: "{{ ipaserver_dirsrv_cert_files | default([]) }}"
-      _dirsrv_pkcs12_info: "{{ ipaserver_test._dirsrv_pkcs12_info }}"
+      _dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info }}"
       external_ca: "{{ ipaserver_external_ca }}"
       external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      _subject_base: "{{ ipaserver_test._subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
-      _ca_subject: "{{ ipaserver_test._ca_subject }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      _subject_base: "{{ result_ipaserver_test._subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
+      _ca_subject: "{{ result_ipaserver_test._ca_subject }}"
       ca_signing_algorithm: "{{ ipaserver_ca_signing_algorithm | default(omit) }}"
 
-      reverse_zones: "{{ ipaserver_test.reverse_zones }}"
+      reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
       no_reverse: "{{ ipaserver_no_reverse }}"
       auto_forwarders: "{{ ipaserver_auto_forwarders }}"
 
   - name: Install - Setup otpd
     ipaserver_setup_otpd:
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
 
   - name: Install - Setup custodia
     ipaserver_setup_custodia:
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
 
   - name: Install - Setup HTTP
     ipaserver_setup_http:
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
       master_password: "{{ ipaserver_master_password }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      #ip_addresses: "{{ ipaserver_test.ip_addresses }}"
-      reverse_zones: "{{ ipaserver_test.reverse_zones }}"
-      setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-      setup_kra: "{{ ipaserver_test.setup_kra }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      #ip_addresses: "{{ result_ipaserver_test.ip_addresses }}"
+      reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
+      setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+      setup_kra: "{{ result_ipaserver_test.setup_kra }}"
       setup_dns: "{{ ipaserver_setup_dns }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      no_host_dns: "{{ ipaserver_test.no_host_dns }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      no_host_dns: "{{ result_ipaserver_test.no_host_dns }}"
       dirsrv_cert_files: "{{ ipaserver_dirsrv_cert_files | default([]) }}"
       external_cert_files: "{{ ipaserver_external_cert_files | default([]) }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      _subject_base: "{{ ipaserver_test._subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
-      _ca_subject: "{{ ipaserver_test._ca_subject }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      _subject_base: "{{ result_ipaserver_test._subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
+      _ca_subject: "{{ result_ipaserver_test._ca_subject }}"
       no_reverse: "{{ ipaserver_no_reverse }}"
       auto_forwarders: "{{ ipaserver_auto_forwarders }}"
-      no_pkinit: "{{ ipaserver_test.no_pkinit }}"
+      no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
       no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
-      idstart: "{{ ipaserver_test.idstart }}"
-      idmax: "{{ ipaserver_test.idmax }}"
+      idstart: "{{ result_ipaserver_test.idstart }}"
+      idmax: "{{ result_ipaserver_test.idmax }}"
       http_cert_files: "{{ ipaserver_http_cert_files | default([]) }}"
       no_ui_redirect: "{{ ipaserver_no_ui_redirect }}"
 
   - name: Install - Setup KRA
     ipaserver_setup_kra:
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
       dm_password: "{{ ipadm_password }}"
-      setup_kra: "{{ ipaserver_test.setup_kra }}"
-    when: ipaserver_test.setup_kra | bool
+      setup_kra: "{{ result_ipaserver_test.setup_kra }}"
+    when: result_ipaserver_test.setup_kra | bool
 
   - name: Install - Setup DNS
     ipaserver_setup_dns:
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
       setup_dns: "{{ ipaserver_setup_dns }}"
-      forwarders: "{{ ipaserver_test.forwarders | default(omit) }}"
+      forwarders: "{{ result_ipaserver_test.forwarders | default(omit) }}"
       forward_policy: "{{ ipaserver_forward_policy | default(omit) }}"
       zonemgr: "{{ ipaserver_zonemgr | default(omit) }}"
       no_dnssec_validation: "{{ ipaserver_no_dnssec_validation }}"
       ### additional ###
-      dns_ip_addresses: "{{ ipaserver_test.dns_ip_addresses }}"
-      dns_reverse_zones: "{{ ipaserver_test.dns_reverse_zones }}"
+      dns_ip_addresses: "{{ result_ipaserver_test.dns_ip_addresses }}"
+      dns_reverse_zones: "{{ result_ipaserver_test.dns_reverse_zones }}"
     when: ipaserver_setup_dns | bool
 
   - name: Install - Setup ADTRUST
     ipaserver_setup_adtrust:
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      setup_adtrust: "{{ ipaserver_test.setup_adtrust }}"
-    when: ipaserver_test.setup_adtrust
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      setup_adtrust: "{{ result_ipaserver_test.setup_adtrust }}"
+    when: result_ipaserver_test.setup_adtrust
 
   - name: Install - Set DS password
     ipaserver_set_ds_password:
       dm_password: "{{ ipadm_password }}"
       password: "{{ ipaadmin_password }}"
-      domain: "{{ ipaserver_test.domain }}"
-      realm: "{{ ipaserver_test.realm }}"
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-      subject_base: "{{ ipaserver_test.subject_base }}"
-      ca_subject: "{{ ipaserver_test.ca_subject }}"
-      no_pkinit: "{{ ipaserver_test.no_pkinit }}"
+      domain: "{{ result_ipaserver_test.domain }}"
+      realm: "{{ result_ipaserver_test.realm }}"
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+      subject_base: "{{ result_ipaserver_test.subject_base }}"
+      ca_subject: "{{ result_ipaserver_test.ca_subject }}"
+      no_pkinit: "{{ result_ipaserver_test.no_pkinit }}"
       no_hbac_allow: "{{ ipaserver_no_hbac_allow }}"
-      idstart: "{{ ipaserver_test.idstart }}"
-      idmax: "{{ ipaserver_test.idmax }}"
+      idstart: "{{ result_ipaserver_test.idstart }}"
+      idmax: "{{ result_ipaserver_test.idmax }}"
       dirsrv_config_file: "{{ ipaserver_dirsrv_config_file | default(omit) }}"
-      _dirsrv_pkcs12_info: "{{ ipaserver_test._dirsrv_pkcs12_info }}"
+      _dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info }}"
 
   #- name: Install - Setup client
   #  include_role:
@@ -319,10 +319,10 @@
   #  vars:
   #    state: present
   #    on_master: yes
-  #    domain: "{{ ipaserver_test.domain }}"
-  #    realm: "{{ ipaserver_test.realm }}"
-  #    server: "{{ ipaserver_test.hostname }}"
-  #    hostname: "{{ ipaserver_test.hostname }}"
+  #    domain: "{{ result_ipaserver_test.domain }}"
+  #    realm: "{{ result_ipaserver_test.realm }}"
+  #    server: "{{ result_ipaserver_test.hostname }}"
+  #    hostname: "{{ result_ipaserver_test.hostname }}"
   #    #no_dns_sshfp: "{{ ipaclient_no_dns_sshfp }}"
   #    #ssh_trust_dns: "{{ ipaclient_ssh_trust_dns }}"
   #    #no_ssh: "{{ ipaclient_no_ssh }}"
@@ -334,10 +334,10 @@
       /usr/sbin/ipa-client-install
       --unattended
       --on-master
-      --domain "{{ ipaserver_test.domain }}"
-      --realm "{{ ipaserver_test.realm }}"
-      --server "{{ ipaserver_test.hostname }}"
-      --hostname "{{ ipaserver_test.hostname }}"
+      --domain "{{ result_ipaserver_test.domain }}"
+      --realm "{{ result_ipaserver_test.realm }}"
+      --server "{{ result_ipaserver_test.hostname }}"
+      --hostname "{{ result_ipaserver_test.hostname }}"
       {{ "--mkhomedir" if ipaclient_mkhomedir | bool else "" }}
 
     #  {{ "--no-dns-sshfp" if ipaclient_no_dns_sshfp | bool else "" }}
@@ -347,12 +347,12 @@
 
   - name: Install - Enable IPA
     ipaserver_enable_ipa:
-      hostname: "{{ ipaserver_test.hostname }}"
-      setup_ca: "{{ ipaserver_test.setup_ca }}"
-    register: ipaserver_enable_ipa
+      hostname: "{{ result_ipaserver_test.hostname }}"
+      setup_ca: "{{ result_ipaserver_test.setup_ca }}"
+    register: result_ipaserver_enable_ipa
 
   - name: Install - Cleanup root IPA cache
     file:
       path: "/root/.ipa_cache"
       state: absent
-    when: ipaserver_enable_ipa.changed
+    when: result_ipaserver_enable_ipa.changed
-- 
GitLab