summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/lib_openshift/library/oc_edit.py8
-rw-r--r--roles/lib_openshift/library/oc_route.py8
-rw-r--r--roles/lib_openshift/src/lib/base.py8
-rw-r--r--roles/lib_utils/src/doc/yedit6
4 files changed, 18 insertions, 12 deletions
diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py
index f78cbf2b3..d44f0da88 100644
--- a/roles/lib_openshift/library/oc_edit.py
+++ b/roles/lib_openshift/library/oc_edit.py
@@ -947,14 +947,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py
index de186ded7..04301a177 100644
--- a/roles/lib_openshift/library/oc_route.py
+++ b/roles/lib_openshift/library/oc_route.py
@@ -951,14 +951,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,
diff --git a/roles/lib_openshift/src/lib/base.py b/roles/lib_openshift/src/lib/base.py
index 4e9aa4461..915a7caca 100644
--- a/roles/lib_openshift/src/lib/base.py
+++ b/roles/lib_openshift/src/lib/base.py
@@ -230,14 +230,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,
diff --git a/roles/lib_utils/src/doc/yedit b/roles/lib_utils/src/doc/yedit
index e367a389e..16b44943e 100644
--- a/roles/lib_utils/src/doc/yedit
+++ b/roles/lib_utils/src/doc/yedit
@@ -102,6 +102,12 @@ options:
required: false
default: true
aliases: []
+ separator:
+ description:
+ - The separator being used when parsing strings.
+ required: false
+ default: '.'
+ aliases: []
author:
- "Kenny Woodson <kwoodson@redhat.com>"
extends_documentation_fragment: []