diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-08 18:30:09 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-12 18:00:05 -0500 |
| commit | a6d5c625956a5051b7bbd9fc48430b9df11084ee (patch) | |
| tree | d6ad72c967c3fcf2bdecb195b93f03a4c4941b47 /roles/openshift_node/tasks/upgrade | |
| parent | 1dccaa2ad90b363cf7f2c04d5781693e69451ffb (diff) | |
| download | openshift-a6d5c625956a5051b7bbd9fc48430b9df11084ee.tar.gz openshift-a6d5c625956a5051b7bbd9fc48430b9df11084ee.tar.bz2 openshift-a6d5c625956a5051b7bbd9fc48430b9df11084ee.tar.xz openshift-a6d5c625956a5051b7bbd9fc48430b9df11084ee.zip | |
Refactor node upgrade to include less serial tasks
This commit moves the pulling of images, packages,
and updating config files into a non-serialized play.
The serialized play is now in charge of marking unschedulable,
draining, stopping and restarting services, and marking
schedulable.
If rpm install / container download takes 60s per host,
this will save 3 hours and 10 minutes at 200 hosts per cluster
and forks of 20 hosts.
Diffstat (limited to 'roles/openshift_node/tasks/upgrade')
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml | 11 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/upgrade/restart.yml | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml b/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml index 245de60a7..8e547351b 100644 --- a/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml +++ b/roles/openshift_node/tasks/upgrade/containerized_node_upgrade.yml @@ -1,14 +1,3 @@ --- -# This is a hack to allow us to use systemd_units.yml, but skip the handlers which -# restart services. We will unconditionally restart all containerized services -# because we have to unconditionally restart Docker: -- set_fact: - skip_node_svc_handlers: True - - name: Update systemd units include_tasks: ../systemd_units.yml - -# This is a no-op because of skip_node_svc_handlers, but lets us trigger it before end of -# play when the node has already been marked schedulable again. (this would look strange -# in logs otherwise) -- meta: flush_handlers diff --git a/roles/openshift_node/tasks/upgrade/restart.yml b/roles/openshift_node/tasks/upgrade/restart.yml index 65c301783..717cfa712 100644 --- a/roles/openshift_node/tasks/upgrade/restart.yml +++ b/roles/openshift_node/tasks/upgrade/restart.yml @@ -13,6 +13,15 @@ - name: Reload systemd to ensure latest unit files command: systemctl daemon-reload +- name: Restart support services + service: + name: "{{ item }}" + state: restarted + enabled: True + with_items: + - NetworkManager + - dnsmasq + - name: Restart container runtime service: name: "{{ openshift_docker_service_name }}" |