summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-07 10:45:12 -0500
committerScott Dodson <sdodson@redhat.com>2017-03-07 14:58:19 -0500
commit049af8749ac52066aa9cc27130b8dd5b00ceaef4 (patch)
tree288563075ce302604c4b9acc9fbeda911ecda84d /roles/lib_openshift/src
parent7556fa3093eaa023b45b64586bf969c5bb86ed45 (diff)
downloadopenshift-049af8749ac52066aa9cc27130b8dd5b00ceaef4.tar.gz
openshift-049af8749ac52066aa9cc27130b8dd5b00ceaef4.tar.bz2
openshift-049af8749ac52066aa9cc27130b8dd5b00ceaef4.tar.xz
openshift-049af8749ac52066aa9cc27130b8dd5b00ceaef4.zip
Generic message directing people to contact support
Diffstat (limited to 'roles/lib_openshift/src')
-rw-r--r--roles/lib_openshift/src/class/oc_objectvalidator.py11
-rwxr-xr-xroles/lib_openshift/src/test/unit/test_oc_objectvalidator.py2
2 files changed, 11 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/class/oc_objectvalidator.py b/roles/lib_openshift/src/class/oc_objectvalidator.py
index b76fc995e..43f6cac67 100644
--- a/roles/lib_openshift/src/class/oc_objectvalidator.py
+++ b/roles/lib_openshift/src/class/oc_objectvalidator.py
@@ -72,6 +72,15 @@ class OCObjectValidator(OpenShiftCLI):
all_invalid[invalid_msg] = invalid
if failed:
- return {'failed': True, 'msg': 'All objects are not valid.', 'state': 'list', 'results': all_invalid}
+ return {
+ 'failed': True,
+ 'msg': (
+ "All objects are not valid. If you are a supported customer please contact "
+ "Red Hat Support providing the complete output above. If you are not a customer "
+ "please contact users@lists.openshift.redhat.com for assistance."
+ ),
+ 'state': 'list',
+ 'results': all_invalid
+ }
return {'msg': 'All objects are valid.'}
diff --git a/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py b/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py
index a97d0493e..da326742f 100755
--- a/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py
+++ b/roles/lib_openshift/src/test/unit/test_oc_objectvalidator.py
@@ -891,7 +891,7 @@ class OCObjectValidatorTest(unittest.TestCase):
# Assert
self.assertTrue(results['failed'])
- self.assertEqual(results['msg'], 'All objects are not valid.')
+ self.assertIn('All objects are not valid.', results['msg'])
self.assertEqual(results['state'], 'list')
self.assertEqual(results['results'], invalid_results)