summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-04-10 10:05:19 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-04-10 10:05:19 -0400
commit49457197ae625deb80e63de2fa86e915cb4607b0 (patch)
treeb0086dacfc4c80f7eb19e4fba0294c678ecd6ce8
parent3ea629b458c78db194443563aab4a8d09e9a07b4 (diff)
downloadopenshift-49457197ae625deb80e63de2fa86e915cb4607b0.tar.gz
openshift-49457197ae625deb80e63de2fa86e915cb4607b0.tar.bz2
openshift-49457197ae625deb80e63de2fa86e915cb4607b0.tar.xz
openshift-49457197ae625deb80e63de2fa86e915cb4607b0.zip
Fixing a compatibility issue with python 2.7 to 3.5 when reading from subprocess.
-rw-r--r--roles/lib_openshift/library/oc_adm_ca_server_cert.py2
-rw-r--r--roles/lib_openshift/src/class/oc_adm_ca_server_cert.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_adm_ca_server_cert.py b/roles/lib_openshift/library/oc_adm_ca_server_cert.py
index c69f5deda..4d083c4d5 100644
--- a/roles/lib_openshift/library/oc_adm_ca_server_cert.py
+++ b/roles/lib_openshift/library/oc_adm_ca_server_cert.py
@@ -1508,7 +1508,7 @@ class CAServerCert(OpenShiftCLI):
x509output, _ = proc.communicate()
if proc.returncode == 0:
regex = re.compile(r"^\s*X509v3 Subject Alternative Name:\s*?\n\s*(.*)\s*\n", re.MULTILINE)
- match = regex.search(x509output) # E501
+ match = regex.search(x509output.decode()) # E501
if not match:
return False
diff --git a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py
index f954f40ef..cf99a6584 100644
--- a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py
+++ b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py
@@ -77,7 +77,7 @@ class CAServerCert(OpenShiftCLI):
x509output, _ = proc.communicate()
if proc.returncode == 0:
regex = re.compile(r"^\s*X509v3 Subject Alternative Name:\s*?\n\s*(.*)\s*\n", re.MULTILINE)
- match = regex.search(x509output) # E501
+ match = regex.search(x509output.decode()) # E501
if not match:
return False