Merge pull request #9566 from mgugino-upstream-stage/cleanup-sanitize-dns

Cleanup old sanitize inventory warnings

inventory/hosts.example

@@ -839,10 +839,6 @@ debug_level=2
 # Setting this variable to false will override that check.
 #openshift_hostname_check=true
 
-# openshift_use_dnsmasq is deprecated.  This must be true, or installs will fail
-# in versions >= 3.6
-#openshift_use_dnsmasq=False
-
 # Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf
 # This is useful for POC environments where DNS may not actually be available yet or to set
 # options like 'strict-order' to alter dnsmasq configuration.

roles/openshift_node/defaults/main.yml

@@ -57,8 +57,6 @@ openshift_node_kubelet_args_dict:
 
 l2_openshift_node_kubelet_args: "{{ openshift_node_kubelet_args_dict[openshift_cloudprovider_kind | default('undefined')] }}"
 
-openshift_node_dnsmasq_install_network_manager_hook: true
-
 # lo must always be present in this list or dnsmasq will conflict with
 # the node's dns service.
 openshift_node_dnsmasq_except_interfaces:

roles/openshift_node/tasks/dnsmasq/network-manager.yml

@@ -5,7 +5,6 @@
     dest: /etc/NetworkManager/dispatcher.d/
     mode: 0755
   notify: restart NetworkManager
-  when: openshift_node_dnsmasq_install_network_manager_hook | default(true) | bool
 
 - name: Add network manager configuration
   ini_file:

roles/openshift_sanitize_inventory/tasks/unsupported.yml

@@ -2,23 +2,6 @@
 # This task list checks for unsupported configurations. Values here should yield
 # a partially functioning cluster but would not be supported for production use.
 
-- name: Ensure that openshift_use_dnsmasq is true
-  when:
-  - not openshift_use_dnsmasq | default(true) | bool
-  fail:
-    msg: |-
-      Starting in 3.6 openshift_use_dnsmasq must be true or critical features
-      will not function. This also means that NetworkManager must be installed
-      enabled and responsible for management of the primary interface.
-
-- name: Ensure that openshift_node_dnsmasq_install_network_manager_hook is true
-  when:
-  - not openshift_node_dnsmasq_install_network_manager_hook | default(true) | bool
-  fail:
-    msg: |-
-      The NetworkManager hook is considered a critical part of the DNS
-      infrastructure.
-
 - set_fact:
     __using_dynamic: True
   when: