diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-16 17:23:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 17:23:29 -0800 |
| commit | f725e46bd897efe35cb8abba7862d1482c3011f4 (patch) | |
| tree | 7b5d834800b770d870d77079ee5c1885ea62b339 /roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml | |
| parent | bd289432c9b6e8b0b0a63f1f8b742e023e4b2fb8 (diff) | |
| parent | afa4fd5799b0ff43d625d061e4c2bde66b5fb86a (diff) | |
| download | openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.gz openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.bz2 openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.tar.xz openshift-f725e46bd897efe35cb8abba7862d1482c3011f4.zip | |
Merge pull request #6082 from mgugino-upstream-stage/combine-node-upgrade
Automatic merge from submit-queue.
Combine openshift_node and openshift_node_upgrade
Currently, having openshift_node and openshift_node_upgrade
as two distinct roles has created a duplication across
handlers, templates, and some tasks.
This commit combines the roles to reduce duplication
and bugs encountered by not putting code in both places.
Diffstat (limited to 'roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml')
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml b/roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml deleted file mode 100644 index 07b0ac715..000000000 --- a/roles/openshift_node_upgrade/tasks/containerized_node_upgrade.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# 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: 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 |