diff options
| author | Russell Teague <rteague@redhat.com> | 2017-12-15 13:56:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 13:56:28 -0500 |
| commit | d96898b3138c4d85ba8e2d8fd34734029697777c (patch) | |
| tree | 573fdd49e86e3fc68fe47bae84ddfa50ccdaa6f1 /playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | |
| parent | e5a4fecbc35cbede7eb2fb23ed42ba8a2f06c3b3 (diff) | |
| parent | c113074f5b84881f416aca40e2bf4e20d4e6ce41 (diff) | |
| download | openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.gz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.bz2 openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.tar.xz openshift-d96898b3138c4d85ba8e2d8fd34734029697777c.zip | |
Merge pull request #6484 from mtnbikenc/tests-as-filters
Deprecate using Ansible tests as filters
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml index a3cb1d0f9..956ad0d53 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml @@ -31,14 +31,14 @@ retries: 10 delay: 5 register: node_unschedulable - until: node_unschedulable|succeeded + until: node_unschedulable is succeeded - name: Drain Node for Kubelet upgrade command: > {{ hostvars[groups.oo_first_master.0].openshift.common.client_binary }} adm 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 + until: not (l_upgrade_nodes_drain_result is failed) retries: 60 delay: 60 @@ -56,8 +56,8 @@ retries: 10 delay: 5 register: node_schedulable - until: node_schedulable|succeeded - when: node_unschedulable|changed + until: node_schedulable is succeeded + when: node_unschedulable is changed - name: Re-enable excluders hosts: oo_nodes_to_upgrade:!oo_masters_to_config |