summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkaurredhat <jkaur@redhat.com>2017-07-18 14:42:17 +0530
committerjkaurredhat <jkaur@redhat.com>2017-07-18 14:42:17 +0530
commitc52233832d7eafc83510b41d3f8875cf27dbdd31 (patch)
treed9204cb068f04a3dfa69e0d04d67a463c5d84fdd
parent61fbb6b57e41651beef6f226ae59683880c113c9 (diff)
downloadopenshift-c52233832d7eafc83510b41d3f8875cf27dbdd31.tar.gz
openshift-c52233832d7eafc83510b41d3f8875cf27dbdd31.tar.bz2
openshift-c52233832d7eafc83510b41d3f8875cf27dbdd31.tar.xz
openshift-c52233832d7eafc83510b41d3f8875cf27dbdd31.zip
drain still pending in below files without fix :
playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml Signed-off-by: jkaurredhat <jkaur@redhat.com>
-rw-r--r--playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
index 07db071ce..42b2e2e98 100644
--- a/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
@@ -52,7 +52,7 @@
- name: Drain Node for Kubelet upgrade
command: >
- {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --force --delete-local-data --ignore-daemonsets
+ {{ openshift.common.admin_binary }} drain {{ openshift.node.nodename }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig --force --delete-local-data --ignore-daemonsets
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/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index 1d1e440d4..eab3a3c15 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
@@ -26,7 +26,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: