fixup: several fixes, playbook, workflow.

freeipa · May 19, 2023 · 3d42ffa · 3d42ffa
1 parent af66fc9
commit 3d42ffa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/multihost.yml b/.github/workflows/multihost.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Get vagrant ssh config and IP addresses
         run: |
-          vagrant ssh-config | tee "vagrant-ssh" | ./get_ip.sh > inventory/group_vars/all.yml
+          vagrant ssh-config | tee "vagrant-ssh" | ./get_ip.sh | tee "inventory/group_vars/all.yaml"
 
       - name: Test host connection
         run: |

diff --git a/tests/multihost/inventory/vagrant-inventory.yml b/tests/multihost/inventory/vagrant-inventory.yml
@@ -30,15 +30,15 @@ all:
         ipaserver_setup_dns: "{{ lookup('env', 'ipaserver_setup_dns') | default(true, True) | bool }}"
         ipaserver_auto_forwarders: "{{ lookup('env', 'ipaserver_auto_forwarders') | default(true, True) | bool }}"
         ipaserver_no_forwarders: "{{ lookup('env', 'ipaserver_no_forwarders') | default(false, True) | bool }}"
-        ipaserver_forwarders: "{{ lookup('env', 'ipaserver_forwarders') | default([], True) }}"
+        ipaserver_forwarders: "{{ lookup('env', 'ipaserver_forwarders') | default(omit, True) }}"
         ipaserver_auto_reverse: "{{ lookup('env', 'ipaserver_auto_reverse') | default(true, True) | bool }}"
         # For easier setup of DNS keep it set to 'true'
         ipaserver_allow_zone_overlap: true
         # DNSSEC must be set to 'false' for AD trust
         ipaserver_no_dnssec_validation: true
         # trust vars
-        ipaserver_setup_adtrust: "{{ lookup('env', 'ipaserver_setup_adtrust') | default(false) | bool }}"
-        ipaserver_netbios_name: "{{ lookup('env', 'ipaserver_netbios_name') | default('IPA') }}"
+        ipaserver_setup_adtrust: "{{ lookup('env', 'ipaserver_setup_adtrust') | default(false, True) | bool }}"
+        ipaserver_netbios_name: "{{ lookup('env', 'ipaserver_netbios_name') | default('IPA', True) }}"
         # disable 'allow all' HBAC rule
         ipaserver_no_hbac_allow: true
         # other vars
@@ -60,16 +60,16 @@ all:
         ipareplica_setup_dns: "{{ lookup('env', 'ipareplica_setup_dns') | default(false, True) | bool }}"
         ipareplica_auto_forwarders: "{{ lookup('env', 'ipareplica_auto_forwarders') | default(true, True) | bool }}"
         ipareplica_no_forwarders: "{{ lookup('env', 'ipareplica_no_forwarders') | default(false, True) | bool }}"
-        ipareplica_forwarders: "{{ lookup('env', 'ipareplica_forwarders') | default([], True) }}"
+        ipareplica_forwarders: "{{ lookup('env', 'ipareplica_forwarders') | default(omit, True) }}"
         ipareplica_auto_reverse: "{{ lookup('env', 'ipareplica_auto_reverse') | default(true, True) | bool }}"
         # Trust backup
-        ipareplica_setup_adtrust: "{{ lookup('env', 'ipaserver_setup_adtrust') | default(false) | bool }}"
-        ipareplica_netbios_name: "{{ lookup('env', 'ipaserver_netbios_name') | default('IPA') }}"
+        ipareplica_setup_adtrust: "{{ lookup('env', 'ipaserver_setup_adtrust') | default(false, True) | bool }}"
+        ipareplica_netbios_name: "{{ lookup('env', 'ipaserver_netbios_name') | default('IPA', True) }}"
         # Update IP addressess
         ipasssd_enable_dns_updates: true
         # Automatically handle DNS nameservers (ansible-freeipa v1.9.0+)
-        ipaclient_configure_dns_resolver: "{{ ipaserver_setup_dns | default(false) }}"
-        ipaclient_dns_servers: ["{{ server_ip if (ipaserver_setup_dns | default(false)) else omit}}"]
+        ipaclient_configure_dns_resolver: "{{ lookup('env', 'ipareplica_setup_dns') | default(false, True) | bool }}"
+        ipaclient_dns_servers: "{{ server_ip if (lookup('env', 'ipareplica_setup_dns') | default(false, True) | bool) else default(omit) }}"
     # IPA Client hosts
     ipaclients:
       hosts:
@@ -83,5 +83,5 @@ all:
         # Add client DNS entries
         ipasssd_enable_dns_updates: true
         # Automatically handle DNS nameservers (ansible-freeipa v1.9.0+)
-        ipaclient_configure_dns_resolver: "{{ ipaserver_setup_dns | default(false) }}"
-        ipaclient_dns_servers: ["{{ server_ip if (ipaserver_setup_dns | default(false)) else omit}}"]
+        ipaclient_configure_dns_resolver: "{{ lookup('env', 'ipareplica_setup_dns') | default(false, True) | bool }}"
+        ipaclient_dns_servers: "{{ server_ip if (lookup('env', 'ipareplica_setup_dns') | default(false, True) | bool) else default(omit) }}"