upgrade node mark 2

1 files changed, 15 insertions, 55 deletions

diff --git a/roles/openshift_node/tasks/upgrade.yml b/roles/openshift_node/tasks/upgrade.yml
index ede73f22c..87556533a 100644
--- a/roles/openshift_node/tasks/upgrade.yml
+++ b/roles/openshift_node/tasks/upgrade.yml
@@ -10,70 +10,29 @@
 
 # tasks file for openshift_node_upgrade
 
-- name: Stop node and openvswitch services
-  service:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-  - "{{ openshift_service_type }}-node"
-  - openvswitch
-  failed_when: false
-
-- name: Ensure containerized services stopped before Docker restart
-  service:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-  - etcd_container
-  - openvswitch
-  - "{{ openshift_service_type }}-master-api"
-  - "{{ openshift_service_type }}-master-controllers"
-  - "{{ openshift_service_type }}-node"
-  failed_when: false
-  when: openshift.common.is_containerized | bool
-
-- service:
-    name: docker
-    state: stopped
-  register: l_openshift_node_upgrade_docker_stop_result
-  until: not l_openshift_node_upgrade_docker_stop_result | failed
-  retries: 3
-  delay: 30
+- name: stop services for upgrade
+  include_tasks: upgrade/stop_services.yml
+
+# Ensure actually install latest package.
+- name: download docker upgrade rpm
+  command: "{{ ansible_pkg_mgr }} install -C -y docker{{ '-' + docker_version }}"
+  register: result
+  until: result | success
   when:
   - l_docker_upgrade is defined
   - l_docker_upgrade | bool
 
-- name: Stop rpm based services
-  service:
-    name: "{{ item }}"
-    state: stopped
-  with_items:
-  - "{{ openshift_service_type }}-node"
-  - openvswitch
-  failed_when: false
+- name: install pre-pulled rpms.
+  include_tasks: upgrade/rpm_upgrade_install.yml
+  vars:
+    openshift_version: "{{ openshift_pkg_version | default('') }}"
   when: not openshift.common.is_containerized | bool
 
+
 - include_tasks: "{{ node_config_hook }}"
   when: node_config_hook is defined
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1513054
-- name: Clean up dockershim data
-  file:
-    path: "/var/lib/dockershim/sandbox/"
-    state: absent
-
-- name: Disable swap
-  command: swapoff --all
-  when:
-  - openshift_node_upgrade_swap_result | default(False) | bool
-  - openshift_disable_swap | default(true) | bool
-  # End Disable Swap Block
-
-- name: Reset selinux context
-  command: restorecon -RF {{ openshift_node_data_dir }}/openshift.local.volumes
-  when:
-  - ansible_selinux is defined
-  - ansible_selinux.status == 'enabled'
+- include_tasks: upgrade/config_changes.yml
 
 # Restart all services
 - include_tasks: upgrade/restart.yml
@@ -90,6 +49,7 @@
   retries: 24
   delay: 5
 
+- include_tasks: dnsmasq_install.yml
 - include_tasks: dnsmasq.yml
 
 - meta: flush_handlers