diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-18 16:56:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 16:56:48 -0400 |
| commit | 429c4e71ba3ef8bb9429b32cfa852d155b38a2a4 (patch) | |
| tree | cb2068bbe31f8dd4d2bed12d6789a7f286271715 /playbooks | |
| parent | 25f5b7168eb5554dca5b91d63a4d21c724f04812 (diff) | |
| parent | c52233832d7eafc83510b41d3f8875cf27dbdd31 (diff) | |
| download | openshift-429c4e71ba3ef8bb9429b32cfa852d155b38a2a4.tar.gz openshift-429c4e71ba3ef8bb9429b32cfa852d155b38a2a4.tar.bz2 openshift-429c4e71ba3ef8bb9429b32cfa852d155b38a2a4.tar.xz openshift-429c4e71ba3ef8bb9429b32cfa852d155b38a2a4.zip | |
Merge pull request #4778 from jkaurredhat/drain_upgrade-1.6
drain still pending in below files without fix :
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 2 |
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 1ed9041d4..02b8a9d3c 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 register: l_docker_upgrade_drain_result diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index af15ec5b2..c93a5d89c 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 }}" register: l_upgrade_nodes_drain_result until: not l_upgrade_nodes_drain_result | failed |