summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-10 20:45:30 -0500
committerGitHub <noreply@github.com>2017-03-10 20:45:30 -0500
commit15100f21a5b60271223d32b41de986ff6c0b3e0f (patch)
tree0179c52807e75538d82bbf68332856917cdddfd6
parent39d078c8b1a17f3e4b827f9962a9f317a6464f3e (diff)
parent613024972ad530ffe1b5acb7b8662d2e69c6d93d (diff)
downloadopenshift-15100f21a5b60271223d32b41de986ff6c0b3e0f.tar.gz
openshift-15100f21a5b60271223d32b41de986ff6c0b3e0f.tar.bz2
openshift-15100f21a5b60271223d32b41de986ff6c0b3e0f.tar.xz
openshift-15100f21a5b60271223d32b41de986ff6c0b3e0f.zip
Merge pull request #3623 from tbielawa/petset_early_fail_again
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml b/playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml
index 9c126033c..fb79f898f 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_5/validator.yml
@@ -35,7 +35,7 @@
kind: petsets
register: l_do_petsets_exist
- - name: FAIL ON Resource migration 'PetSets' unsupported
+ - name: Fail on unsupported resource migration 'PetSets'
fail:
msg: >
PetSet objects were detected in your cluster. These are an
@@ -62,6 +62,6 @@
$ oc get petsets --all-namespaces -o yaml | oc delete -f - --cascale=false
when:
# Search did not fail, valid resource type found
- - l_do_petsets_exist.results.returncode == "0"
+ - l_do_petsets_exist.results.returncode == 0
# Items do exist in the search results
- l_do_petsets_exist.results.results.0['items'] | length > 0