diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-08 13:38:03 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-12 10:04:41 -0500 |
| commit | e1df3b6ba7b78255c8022468e9ad1a32255e5e59 (patch) | |
| tree | dc3a2f8018412314c1fa84bd526610c0c83660eb /playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml | |
| parent | 01ae634a0bf89fe840006f9139f8ffd20e09afc8 (diff) | |
| download | openshift-e1df3b6ba7b78255c8022468e9ad1a32255e5e59.tar.gz openshift-e1df3b6ba7b78255c8022468e9ad1a32255e5e59.tar.bz2 openshift-e1df3b6ba7b78255c8022468e9ad1a32255e5e59.tar.xz openshift-e1df3b6ba7b78255c8022468e9ad1a32255e5e59.zip | |
Refactor upgrade codepaths step 1
This commit refactors some upgrade code paths.
Touched areas are:
1) Reduces usage of 'oo_all_hosts' in various places,
especially when running upgrade_control_plane.
2) Reuses common code across the various upgrade*
playbooks.
3) Moves docker upgrade checks into container_runtime_role.
4) Combines smaller playbooks and plays to reduce file sprawl.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml index fcb828808..38aa9df47 100644 --- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -19,7 +19,9 @@ msg: Cannot upgrade Docker on Atomic operating systems. when: openshift.common.is_atomic | bool - - include_tasks: upgrade_check.yml + - include_role: + name: container_runtime + tasks_from: docker_upgrade_check.yml when: docker_upgrade is not defined or docker_upgrade | bool |