Merge pull request #227 from stackhpc/upstream/zed-2023-12-15

Synchronise zed with upstream
stackhpc · Dec 15, 2023 · 0a5ed30 · 0a5ed30
2 parents 7f5b649 + fde242b
commit 0a5ed30
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/ansible/roles/network-redhat/tasks/main.yml b/ansible/roles/network-redhat/tasks/main.yml
@@ -4,6 +4,22 @@
   when: resolv_is_managed | bool
   become: True
 
+- name: Ensure NetworkManager DNS config is present only if required
+  become: true
+  community.general.ini_file:
+    path: /etc/NetworkManager/NetworkManager.conf
+    section: main
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+    state: "{{ 'present' if resolv_is_managed | bool else 'absent'}}"
+  loop:
+    - option: dns
+      value: none
+    - option: rc-manager
+      value: unmanaged
+  when:
+    - ansible_facts.os_family == "RedHat" and ansible_facts.distribution_major_version == "9"
+
 - name: Configure network interfaces (RedHat)
   import_role:
     name: MichaelRigart.interfaces

diff --git a/releasenotes/notes/fix-resolv-conf-management-141788e64d0e82a0.yaml b/releasenotes/notes/fix-resolv-conf-management-141788e64d0e82a0.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes a bug where NetworkManager would overwrite resolv.conf when
+    ``resolv_is_managed`` is set to ``True``.
+    `LP#2044537 <https://launchpad.net/bugs/2044537>`__