From 400dfc8285e994e7348b186794ccd5cf95778604 Mon Sep 17 00:00:00 2001
From: Douglas Viroel <dviroel@redhat.com>
Date: Tue, 8 Mar 2022 13:43:08 -0300
Subject: [PATCH] Updates baremetal-full-freeipa playbook to reload
 NetworkManager

This patch updates the fix to also reload NetworkManager after making
changes to its configuration file. It also adds 'ooo.test' as search
domain since it is hardcoded in deploy_freeipa.sh script.

Related-Bug: #1962727
Change-Id: If0eebb2903649bd0a9a2f4a184c2cc3daf9dc4e5
---
 playbooks/baremetal-full-freeipa.yml | 46 +++++++++++++++++-----------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/playbooks/baremetal-full-freeipa.yml b/playbooks/baremetal-full-freeipa.yml
index a96641af9..e8e1dfbdc 100644
--- a/playbooks/baremetal-full-freeipa.yml
+++ b/playbooks/baremetal-full-freeipa.yml
@@ -46,28 +46,32 @@
     - include_role:
         name: freeipa-setup
 
-- name: Use  supplemental node as DNS server
+- name: Use supplemental node as DNS server
   hosts: undercloud
   gather_facts: false
   tags:
     - freeipa-setup
   tasks:
 
-    - name: ensure that DHCP doesn't overwite DNS settings (CentOS/RHEL >= 8)
+    - name: ensure that DHCP doesn't overwrite DNS settings (CentOS/RHEL >= 8)
       become: true
-      lineinfile:
-        path: /etc/NetworkManager/NetworkManager.conf
-        regexp: '^dns='
-        insertafter: '^[main]'
-        line: 'dns=none'
       when:
         - ansible_os_family == 'RedHat'
         - ansible_distribution_major_version is version(8, '>=')
-
-    - name: cat out resolv.conf to see original DNS config
-      become: true
-      debug:
-        msg: "Content of resolv.conf before modifications: {{ lookup('file', '/etc/resolv.conf') }}"
+      block:
+        - name: set 'dns=none' in NetworkManager config file
+          ini_file:
+            path: /etc/NetworkManager/NetworkManager.conf
+            state: present
+            no_extra_spaces: true
+            section: main
+            option: dns
+            value: none
+            backup: true
+        - name: reload NetworkManager service
+          service:
+            name: NetworkManager
+            state: reloaded
 
     - name: remove any existing entries from the resolv.conf file
       become: true
@@ -76,17 +80,23 @@
         regexp: "^nameserver "
         state: absent
 
-    - name: disable unbound service
+    - name: set IPA server domain search
       become: true
-      service:
-        name: unbound
-        state: stopped
-      ignore_errors: true
+      lineinfile:
+        path: /etc/resolv.conf
+        insertafter: '^search'
+        line: "search ooo.test"
+        state: present
 
     - name: set IPA server as primary DNS provider
       become: true
       lineinfile:
         path: /etc/resolv.conf
         insertafter: '^search'
-        line: "nameserver {{ supplemental_node_ip }}"
+        line: "nameserver {{ freeipa_internal_ip }}"
         state: present
+
+    - name: print content of 'resolv.conf' after modifications
+      become: true
+      debug:
+        msg: "Content of resolv.conf: {{ lookup('file', '/etc/resolv.conf') }}"