summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-03-30 14:57:28 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-04-04 11:17:18 -0400
commitcd595caf9ed8cdbf45bed51b99129645aec34b7f (patch)
tree988a9ba770acacd36ec5c6c173dad82a7281489a /roles/lib_openshift/library
parent68b31569f7867afd67915098712cc832df95e59d (diff)
downloadopenshift-cd595caf9ed8cdbf45bed51b99129645aec34b7f.tar.gz
openshift-cd595caf9ed8cdbf45bed51b99129645aec34b7f.tar.bz2
openshift-cd595caf9ed8cdbf45bed51b99129645aec34b7f.tar.xz
openshift-cd595caf9ed8cdbf45bed51b99129645aec34b7f.zip
Adding signed router cert and fixing server_cert bug.
Diffstat (limited to 'roles/lib_openshift/library')
-rw-r--r--roles/lib_openshift/library/oc_adm_ca_server_cert.py3
1 files changed, 3 insertions, 0 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 2f6026fbf..6a4e9b512 100644
--- a/roles/lib_openshift/library/oc_adm_ca_server_cert.py
+++ b/roles/lib_openshift/library/oc_adm_ca_server_cert.py
@@ -1505,6 +1505,9 @@ class CAServerCert(OpenShiftCLI):
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
+ if not match:
+ return False
+
for entry in re.split(r", *", match.group(1)):
if entry.startswith('DNS') or entry.startswith('IP Address'):
cert_names.append(entry.split(':')[1])