7 files changed, 4 insertions, 61 deletions
diff --git a/roles/openshift_node/tasks/bootstrap.yml b/roles/openshift_node/tasks/bootstrap.yml
index b83b2c452..6bd2df362 100644
--- a/roles/openshift_node/tasks/bootstrap.yml
+++ b/roles/openshift_node/tasks/bootstrap.yml
@@ -29,7 +29,7 @@
     line: "{% raw %}ExecStart=/usr/bin/openshift start node --bootstrap --kubeconfig=${KUBECONFIG} $OPTIONS{% endraw %}"
     regexp: "^ExecStart=.*"
 
-- name: "systemctl enable {{ openshift_service_type }}-node"
+- name: "disable {{ openshift_service_type }}-node and {{ openshift_service_type }}-master services"
   systemd:
     name: "{{ item }}"
     enabled: no
diff --git a/roles/openshift_node/tasks/config.yml b/roles/openshift_node/tasks/config.yml
index e3898b520..e5fcaf9af 100644
--- a/roles/openshift_node/tasks/config.yml
+++ b/roles/openshift_node/tasks/config.yml
@@ -111,9 +111,5 @@
     msg: Node failed to start please inspect the logs and try again
   when: node_start_result | failed
 
-- name: Setup tuned
-  include: tuned.yml
-  static: yes
-
 - set_fact:
     node_service_status_changed: "{{ node_start_result | changed }}"
diff --git a/roles/openshift_node/tasks/config/configure-node-settings.yml b/roles/openshift_node/tasks/config/configure-node-settings.yml
index 1186062eb..527580481 100644
--- a/roles/openshift_node/tasks/config/configure-node-settings.yml
+++ b/roles/openshift_node/tasks/config/configure-node-settings.yml
@@ -7,7 +7,7 @@
     create: true
   with_items:
   - regex: '^OPTIONS='
-    line: "OPTIONS=--loglevel={{ openshift.node.debug_level | default(2) }}"
+    line: "OPTIONS=--loglevel={{ openshift_node_debug_level }}"
   - regex: '^CONFIG_FILE='
     line: "CONFIG_FILE={{ openshift.common.config_base }}/node/node-config.yaml"
   - regex: '^IMAGE_VERSION='
diff --git a/roles/openshift_node/tasks/config/install-node-docker-service-file.yml b/roles/openshift_node/tasks/config/install-node-docker-service-file.yml
deleted file mode 100644
index f92ff79b5..000000000
--- a/roles/openshift_node/tasks/config/install-node-docker-service-file.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Install Node docker service file
-  template:
-    dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
-    src: openshift.docker.node.service
-  notify:
-  - reload systemd units
-  - restart node
diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml
index 265bf2c46..1539d6e3b 100644
--- a/roles/openshift_node/tasks/install.yml
+++ b/roles/openshift_node/tasks/install.yml
@@ -27,5 +27,3 @@
       docker pull {{ openshift.node.node_image }}:{{ openshift_image_tag }}
     register: pull_result
     changed_when: "'Downloaded newer image' in pull_result.stdout"
-
-  - include: config/install-node-docker-service-file.yml
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml
index 6b4490f61..9c182ade6 100644
--- a/roles/openshift_node/tasks/systemd_units.yml
+++ b/roles/openshift_node/tasks/systemd_units.yml
@@ -1,11 +1,9 @@
 ---
-# This file is included both in the openshift_master role and in the upgrade
-# playbooks.
 - name: Install Node service file
   template:
     dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service"
-    src: "node.service.j2"
-  when: not openshift.common.is_containerized | bool
+    src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}"
+  when: not openshift.common.is_node_system_container | bool
   notify:
   - reload systemd units
   - restart node
diff --git a/roles/openshift_node/tasks/tuned.yml b/roles/openshift_node/tasks/tuned.yml
deleted file mode 100644
index 425bf6a26..000000000
--- a/roles/openshift_node/tasks/tuned.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Check for tuned package
-  command: rpm -q tuned
-  args:
-    warn: no
-  register: tuned_installed
-  changed_when: false
-  failed_when: false
-
-- name: Tuned service setup
-  block:
-  - name: Set tuned OpenShift variables
-    set_fact:
-      openshift_tuned_guest_profile: "{{ 'atomic-guest' if openshift.common.is_atomic else 'virtual-guest' }}"
-      tuned_etc_directory: '/etc/tuned'
-      tuned_templates_source: '../templates/tuned'
-
-  - name: Ensure directory structure exists
-    file:
-      state: directory
-      dest: '{{ tuned_etc_directory }}/{{ item.path }}'
-    with_filetree: '{{ tuned_templates_source }}'
-    when: item.state == 'directory'
-
-  - name: Ensure files are populated from templates
-    template:
-      src: '{{ item.src }}'
-      dest: '{{ tuned_etc_directory }}/{{ item.path }}'
-    with_filetree: '{{ tuned_templates_source }}'
-    when: item.state == 'file'
-
-  - name: Make tuned use the recommended tuned profile on restart
-    file: path=/etc/tuned/active_profile state=absent
-
-  - name: Restart tuned service
-    systemd:
-      state: restarted
-      daemon_reload: yes
-      name: tuned
-
-  when: tuned_installed.rc == 0 | bool