summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-24 14:40:17 -0500
committerGitHub <noreply@github.com>2017-05-24 14:40:17 -0500
commit4cbad661430bd10e4012f753405f3eca094a2f95 (patch)
treece26024ab630680ce48d84cc5f717baa92194508
parentc1822d03c672dcea889b5ef9263fea54ddf7ce1c (diff)
parentcd10742ac6f08961f3ddaf0216494a4d4dd31136 (diff)
downloadopenshift-4cbad661430bd10e4012f753405f3eca094a2f95.tar.gz
openshift-4cbad661430bd10e4012f753405f3eca094a2f95.tar.bz2
openshift-4cbad661430bd10e4012f753405f3eca094a2f95.tar.xz
openshift-4cbad661430bd10e4012f753405f3eca094a2f95.zip
Merge pull request #4244 from jarrpa/oc_process-err
Merged by openshift-bot
-rw-r--r--roles/lib_openshift/library/oc_process.py2
-rw-r--r--roles/lib_openshift/src/class/oc_process.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_process.py b/roles/lib_openshift/library/oc_process.py
index 330de07eb..15e9c606d 100644
--- a/roles/lib_openshift/library/oc_process.py
+++ b/roles/lib_openshift/library/oc_process.py
@@ -1450,7 +1450,7 @@ class OCProcess(OpenShiftCLI):
if self._template is None:
results = self._process(self.name, False, self.params, self.data)
if results['returncode'] != 0:
- raise OpenShiftCLIError('Error processing template [%s].' % self.name)
+ raise OpenShiftCLIError('Error processing template [%s]: %s' %(self.name, results))
self._template = results['results']['items']
return self._template
diff --git a/roles/lib_openshift/src/class/oc_process.py b/roles/lib_openshift/src/class/oc_process.py
index eba9a43cd..62a6bd571 100644
--- a/roles/lib_openshift/src/class/oc_process.py
+++ b/roles/lib_openshift/src/class/oc_process.py
@@ -30,7 +30,7 @@ class OCProcess(OpenShiftCLI):
if self._template is None:
results = self._process(self.name, False, self.params, self.data)
if results['returncode'] != 0:
- raise OpenShiftCLIError('Error processing template [%s].' % self.name)
+ raise OpenShiftCLIError('Error processing template [%s]: %s' %(self.name, results))
self._template = results['results']['items']
return self._template