Merge pull request #949 from Jaganathancse/adoption_dns_resolv_update_config

openshift-merge-bot[bot] · web-flow · commit 9da94c512ed7 · 2025-05-28T18:22:14.000Z
Disable NetworkManager DNS config update
diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc
@@ -490,6 +490,10 @@ endif::[]
            {% endfor %}
 
         edpm_network_config_nmstate: false
+        # Control resolv.conf management by NetworkManager
+        # false = disable NetworkManager resolv.conf update (default)
+        # true = enable NetworkManager resolv.conf update
+        edpm_bootstrap_network_resolvconf_update: false
         edpm_network_config_hide_sensitive_logs: false
         #
         # These vars are for the network config templates themselves and are
diff --git a/tests/roles/dataplane_adoption/defaults/main.yaml b/tests/roles/dataplane_adoption/defaults/main.yaml
@@ -225,6 +225,7 @@ dataplane_cr: |
             {{ edpm_network_config_template| indent(10) }}
 
           edpm_network_config_nmstate: false
+          edpm_bootstrap_network_resolvconf_update: false
           edpm_network_config_hide_sensitive_logs: false
           #
           # These vars are for the network config templates themselves and are

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ dataplane_cr: \|`
`225`	`225`	`{{ edpm_network_config_template\| indent(10) }}`
`226`	`226`
`227`	`227`	`edpm_network_config_nmstate: false`
	`228`	`+ edpm_bootstrap_network_resolvconf_update: false`
`228`	`229`	`edpm_network_config_hide_sensitive_logs: false`
`229`	`230`	`#`
`230`	`231`	`# These vars are for the network config templates themselves and are`