summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-02-23 11:18:14 -0500
committerGitHub <noreply@github.com>2017-02-23 11:18:14 -0500
commit05bccd27a735d6884ee389bd3d55e0458f7d3daa (patch)
tree1799a3181d9002536dd7fc285b62239c1074313d
parent2bde0e2816873f924f710dec40d9a77c0da318ce (diff)
parentad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5 (diff)
downloadopenshift-05bccd27a735d6884ee389bd3d55e0458f7d3daa.tar.gz
openshift-05bccd27a735d6884ee389bd3d55e0458f7d3daa.tar.bz2
openshift-05bccd27a735d6884ee389bd3d55e0458f7d3daa.tar.xz
openshift-05bccd27a735d6884ee389bd3d55e0458f7d3daa.zip
Merge pull request #3465 from mtnbikenc/task-wait
BZ 1425688: Convert selectattr tests to use 'match'
-rw-r--r--playbooks/common/openshift-node/restart.yml2
-rw-r--r--roles/openshift_logging/tasks/upgrade_logging.yaml2
-rw-r--r--roles/openshift_node_upgrade/tasks/main.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-node/restart.yml b/playbooks/common/openshift-node/restart.yml
index 5e1df951c..441b100e9 100644
--- a/playbooks/common/openshift-node/restart.yml
+++ b/playbooks/common/openshift-node/restart.yml
@@ -51,7 +51,7 @@
register: node_output
delegate_to: "{{ groups.oo_first_master.0 }}"
when: inventory_hostname in groups.oo_nodes_to_config
- until: node_output.results.results[0].status.conditions | selectattr('type', 'equalto', 'Ready') | map(attribute='status') | join | bool == True
+ until: node_output.results.results[0].status.conditions | selectattr('type', 'match', '^Ready$') | map(attribute='status') | join | bool == True
# Give the node two minutes to come back online.
retries: 24
delay: 5
diff --git a/roles/openshift_logging/tasks/upgrade_logging.yaml b/roles/openshift_logging/tasks/upgrade_logging.yaml
index 83867d361..30fdbd2af 100644
--- a/roles/openshift_logging/tasks/upgrade_logging.yaml
+++ b/roles/openshift_logging/tasks/upgrade_logging.yaml
@@ -33,7 +33,7 @@
selector: "component=es"
namespace: "{{openshift_logging_namespace}}"
register: running_pod
- until: running_pod.results.results[0]['items'] | selectattr('status.phase', 'equalto', 'Running') | map(attribute='metadata.name') | list | length != 0
+ until: running_pod.results.results[0]['items'] | selectattr('status.phase', 'match', '^Running$') | map(attribute='metadata.name') | list | length != 0
retries: 30
delay: 10
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml
index 96e296a3b..2f79931df 100644
--- a/roles/openshift_node_upgrade/tasks/main.yml
+++ b/roles/openshift_node_upgrade/tasks/main.yml
@@ -82,7 +82,7 @@
name: "{{ openshift.common.hostname | lower }}"
register: node_output
delegate_to: "{{ groups.oo_first_master.0 }}"
- until: node_output.results.results[0].status.conditions | selectattr('type', 'equalto', 'Ready') | map(attribute='status') | join | bool == True
+ until: node_output.results.results[0].status.conditions | selectattr('type', 'match', '^Ready$') | map(attribute='status') | join | bool == True
# Give the node two minutes to come back online.
retries: 24
delay: 5