diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-11 14:34:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 14:34:17 -0500 |
| commit | 5aae26f2aa7d5521421343f33973325be2db9d06 (patch) | |
| tree | 0ee48ac1c5354a2a8fa00a829ce1ae2765d2fab5 /roles | |
| parent | f11303975bc87febdf7ba992c2c0971e40890dce (diff) | |
| parent | 49457197ae625deb80e63de2fa86e915cb4607b0 (diff) | |
| download | openshift-5aae26f2aa7d5521421343f33973325be2db9d06.tar.gz openshift-5aae26f2aa7d5521421343f33973325be2db9d06.tar.bz2 openshift-5aae26f2aa7d5521421343f33973325be2db9d06.tar.xz openshift-5aae26f2aa7d5521421343f33973325be2db9d06.zip | |
Merge pull request #3894 from kwoodson/compat_server_cert
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_ca_server_cert.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_ca_server_cert.py | 2 |
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 |