summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-02-23 09:17:34 -0500
committerRussell Teague <rteague@redhat.com>2017-02-23 09:38:13 -0500
commitad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5 (patch)
treecfb46540d5f8bf20714e1bd9c0d6435307671c89 /roles
parentdafb278bcfc8e4452a658e8553013094cad854aa (diff)
downloadopenshift-ad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5.tar.gz
openshift-ad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5.tar.bz2
openshift-ad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5.tar.xz
openshift-ad1455792dfcc9a3a01d3f8e7ef706906b2bf2a5.zip
Convert selectattr tests to use 'match'
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging/tasks/upgrade_logging.yaml2
-rw-r--r--roles/openshift_node_upgrade/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
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