Remove openshift_docker_is_node_or_master - all masters and etcd hosts are now nodes

playbooks/container-runtime/private/config.yml

@@ -25,4 +25,3 @@
         tasks_from: package_crio.yml
       when:
         - openshift_use_crio | bool
-        - openshift_docker_is_node_or_master | bool

playbooks/container-runtime/private/setup_storage.yml

@@ -17,7 +17,6 @@
         tasks_from: docker_storage_setup_overlay.yml
       when:
         - container_runtime_docker_storage_type|default('') == "overlay2"
-        - openshift_docker_is_node_or_master | bool
     - import_role:
         name: container_runtime
         tasks_from: extra_storage_setup.yml

roles/container_runtime/defaults/main.yml

@@ -44,8 +44,6 @@ r_crio_os_firewall_allow:
 
 r_crio_use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(True) }}"
 
-openshift_docker_is_node_or_master: "{{ True if inventory_hostname in (groups['oo_masters_to_config']|default([])) or inventory_hostname in (groups['oo_nodes_to_config']|default([])) else False | bool }}"
-
 docker_alt_storage_path: /var/lib/containers/docker
 docker_default_storage_path: /var/lib/docker
 docker_storage_path: "{{ docker_default_storage_path }}"