summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-04-05 12:30:54 -0500
committerGitHub <noreply@github.com>2017-04-05 12:30:54 -0500
commitb930b55451bfc6d868e1ffc788a3674921740c94 (patch)
tree83298a514172d2ff90bb6564fa228f9461084f5d /roles/lib_openshift/src
parent9b0f2945ece3798ef48bb38a07fa98239a141d65 (diff)
parentcd595caf9ed8cdbf45bed51b99129645aec34b7f (diff)
downloadopenshift-b930b55451bfc6d868e1ffc788a3674921740c94.tar.gz
openshift-b930b55451bfc6d868e1ffc788a3674921740c94.tar.bz2
openshift-b930b55451bfc6d868e1ffc788a3674921740c94.tar.xz
openshift-b930b55451bfc6d868e1ffc788a3674921740c94.zip
Merge pull request #3821 from kwoodson/default_router_cert
Merged by openshift-bot
Diffstat (limited to 'roles/lib_openshift/src')
-rw-r--r--roles/lib_openshift/src/class/oc_adm_ca_server_cert.py3
1 files changed, 3 insertions, 0 deletions
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 fa0c4e3af..018ce8d42 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
@@ -78,6 +78,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])