summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-14 11:32:23 -0400
committerGitHub <noreply@github.com>2017-07-14 11:32:23 -0400
commitbc97ca2b93d7fb8487a409fafd99397aa21e0e64 (patch)
tree95af192f928b6cee5ccfc6fad11075c0c3576441
parentc5524a1d1688dbfdab728349f991770f60773090 (diff)
parent5b73851774e290e470e471f29c01db387e1980ce (diff)
downloadopenshift-bc97ca2b93d7fb8487a409fafd99397aa21e0e64.tar.gz
openshift-bc97ca2b93d7fb8487a409fafd99397aa21e0e64.tar.bz2
openshift-bc97ca2b93d7fb8487a409fafd99397aa21e0e64.tar.xz
openshift-bc97ca2b93d7fb8487a409fafd99397aa21e0e64.zip
Merge pull request #4750 from jkaurredhat/drain_upgrade1.6
Upgrade fails when "Drain Node for Kubelet upgrade"
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 86f2cfa54..b7f089d99 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -294,7 +294,7 @@
- name: Drain Node for Kubelet upgrade
command: >
- {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --force --delete-local-data --ignore-daemonsets
+ {{ hostvars[groups.oo_first_master.0].openshift.common.admin_binary }} drain {{ openshift.node.nodename | lower }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig --force --delete-local-data --ignore-daemonsets
delegate_to: "{{ groups.oo_first_master.0 }}"
roles: