3 files changed, 1 insertions, 17 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index e60d96760..d9f3e920d 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -6,7 +6,7 @@
     - deployment_type == 'openshift-enterprise'
     - not openshift_use_crio
 
-- include: dnsmasq.yml
+- include_tasks: dnsmasq.yml
 
 - name: setup firewall
   import_tasks: firewall.yml
@@ -44,13 +44,6 @@
 - name: include node installer
   include_tasks: install.yml
 
-- name: Restart cri-o
-  systemd:
-    name: cri-o
-    enabled: yes
-    state: restarted
-  when: openshift_use_crio
-
 - name: restart NetworkManager to ensure resolv.conf is present
   systemd:
     name: NetworkManager
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index eb8d9a6a5..98a391890 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/roles/openshift_node/tasks/node_system_container.yml
@@ -1,8 +1,4 @@
 ---
-- name: Ensure proxies are in the atomic.conf
-  include_role:
-    name: openshift_atomic
-    tasks_from: proxy
 
 - name: Pre-pull node system container image
   command: >
diff --git a/roles/openshift_node/tasks/openvswitch_system_container.yml b/roles/openshift_node/tasks/openvswitch_system_container.yml
index d33e172c1..b61bc84c1 100644
--- a/roles/openshift_node/tasks/openvswitch_system_container.yml
+++ b/roles/openshift_node/tasks/openvswitch_system_container.yml
@@ -7,11 +7,6 @@
     l_service_name: "{{ openshift_docker_service_name }}"
   when: not openshift_use_crio
 
-- name: Ensure proxies are in the atomic.conf
-  include_role:
-    name: openshift_atomic
-    tasks_from: proxy
-
 - name: Pre-pull OpenVSwitch system container image
   command: >
     atomic pull --storage=ostree {{ 'docker:' if system_images_registry == 'docker' else system_images_registry + '/' }}{{ openshift.node.ovs_system_image }}:{{ openshift_image_tag }}