From bd7690dc2a3b35c4c3a7a1fc7c47403338cf08e3 Mon Sep 17 00:00:00 2001
From: "@lessfoobar" <59063885+lessfoobar@users.noreply.github.com>
Date: Wed, 8 Mar 2023 23:19:18 +0100
Subject: [PATCH 1/3] fix for npt

fix for ntp server. This way when you set the ntp_server or the pool it doesn't still take no_ntp
---
 roles/ipaserver/tasks/install.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index f4906dc9d6..ce92e79590 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -96,7 +96,7 @@
     # mkhomedir
     ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}"
     ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
-    no_ntp: "{{ ipaclient_no_ntp }}"
+    no_ntp: "{{ (ipaclient_ntp_servers is defined or ipaclient_ntp_pool is defined) | ternary(omit, ipaclient_no_ntp) }}"
     # ssh_trust_dns
     # no_ssh
     # no_sshd

From cce0decf6aeaa6ebe60367ada1cce3c4d2c9cdf7 Mon Sep 17 00:00:00 2001
From: "@lessfoobar" <59063885+lessfoobar@users.noreply.github.com>
Date: Thu, 9 Mar 2023 00:53:54 +0100
Subject: [PATCH 2/3] guess I forgot to make the changes here as well

TASK [freeipa.ansible_freeipa.ipaclient : Install - IPA client test] ***********
fatal: [ipamaster.int.REDACTED.com]: FAILED! => {"changed": false, "msg": "--ntp-pool cannot be used together with --no-ntp"}
---
 roles/ipaclient/tasks/install.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index e76842fc29..4e2f66bc63 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -58,7 +58,7 @@
     hostname: "{{ ipaclient_hostname | default(ansible_facts['fqdn']) }}"
     ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}"
     ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
-    no_ntp: "{{ ipaclient_no_ntp }}"
+    no_ntp: "{{ (ipaclient_ntp_servers is defined or ipaclient_ntp_pool is defined) | ternary(omit, ipaclient_no_ntp) }}"
     force_ntpd: "{{ ipaclient_force_ntpd }}"
     nisdomain: "{{ ipaclient_nisdomain | default(omit) }}"
     no_nisdomain: "{{ ipaclient_no_nisdomain }}"
@@ -89,7 +89,7 @@
       ### basic ###
       ntp_servers: "{{ result_ipaclient_test.ntp_servers | default(omit) }}"
       ntp_pool: "{{ result_ipaclient_test.ntp_pool | default(omit) }}"
-      no_ntp: "{{ ipaclient_no_ntp }}"
+      no_ntp: "{{ (ipaclient_ntp_servers is defined or ipaclient_ntp_pool is defined) | ternary(omit, ipaclient_no_ntp) }}"
       # force_ntpd: "{{ ipaclient_force_ntpd }}"
       on_master: "{{ ipaclient_on_master }}"
       ### additional ###

From e4211f40f83a878626178c7ff83454963bb3b221 Mon Sep 17 00:00:00 2001
From: "@lessfoobar" <59063885+lessfoobar@users.noreply.github.com>
Date: Fri, 10 Mar 2023 18:28:53 +0100
Subject: [PATCH 3/3] missed the replica part as well

---
 roles/ipareplica/tasks/install.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index d4fb2997ae..00e5b05d0d 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -88,7 +88,7 @@
     http_cert_files: "{{ ipareplica_http_cert_files | default([]) }}"
     pkinit_cert_files: "{{ ipareplica_pkinit_cert_files | default([]) }}"
     ### client ###
-    no_ntp: "{{ ipaclient_no_ntp }}"
+    no_ntp: "{{ (ipaclient_ntp_servers is defined or ipaclient_ntp_pool is defined) | ternary(omit, ipaclient_no_ntp) }}"
     ntp_servers: "{{ ipaclient_ntp_servers | default([]) }}"
     ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
     ### dns ###
@@ -180,7 +180,7 @@
       keytab: "{{ ipaclient_keytab | default(omit) }}"
       mkhomedir: "{{ ipaclient_mkhomedir | default(omit) }}"
       force_join: "{{ ipaclient_force_join | default(omit) }}"
-      no_ntp: "{{ ipaclient_no_ntp | default(omit) }}"
+      no_ntp: "{{ (ipaclient_ntp_servers is defined or ipaclient_ntp_pool is defined) | ternary(omit, ipaclient_no_ntp) }}"
       ssh_trust_dns: "{{ ipaclient_ssh_trust_dns | default(omit) }}"
       no_ssh: no
       no_sshd: no