From c52233832d7eafc83510b41d3f8875cf27dbdd31 Mon Sep 17 00:00:00 2001
From: jkaurredhat <jkaur@redhat.com>
Date: Tue, 18 Jul 2017 14:42:17 +0530
Subject: 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>
---
playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml | 2 +-
playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'playbooks/common/openshift-cluster')
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:
--
cgit v1.2.3