summaryrefslogtreecommitdiffstats
path: root/playbooks/byo/openshift-cluster/upgrades/docker
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/byo/openshift-cluster/upgrades/docker')
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml2
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml10
2 files changed, 9 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml
index dc0bf73a2..13e1da961 100644
--- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -31,7 +31,7 @@
- name: Drain Node for Kubelet upgrade
command: >
- {{ openshift.common.client_binary }} adm manage-node {{ openshift.node.nodename }} {{ openshift.common.evacuate_or_drain }} --force
+ {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --force --delete-local-data
delegate_to: "{{ groups.oo_first_master.0 }}"
when: l_docker_upgrade is defined and l_docker_upgrade | bool and inventory_hostname in groups.oo_nodes_to_upgrade
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
index 6de054937..d5fd7c424 100644
--- a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
@@ -1,9 +1,12 @@
---
# Playbook to upgrade Docker to the max allowable version for an OpenShift cluster.
-- hosts: localhost
+- name: Create initial host groups for localhost
+ hosts: localhost
connection: local
become: no
gather_facts: no
+ tags:
+ - always
tasks:
- include_vars: ../../cluster_hosts.yml
- name: Evaluate group l_oo_all_hosts
@@ -13,8 +16,11 @@
with_items: "{{ g_all_hosts | default([]) }}"
changed_when: False
-- hosts: l_oo_all_hosts
+- name: Create initial host groups for all hosts
+ hosts: l_oo_all_hosts
gather_facts: no
+ tags:
+ - always
tasks:
- include_vars: ../../cluster_hosts.yml