diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-05 12:30:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 12:30:54 -0500 |
| commit | b930b55451bfc6d868e1ffc788a3674921740c94 (patch) | |
| tree | 83298a514172d2ff90bb6564fa228f9461084f5d /roles/lib_openshift | |
| parent | 9b0f2945ece3798ef48bb38a07fa98239a141d65 (diff) | |
| parent | cd595caf9ed8cdbf45bed51b99129645aec34b7f (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_ca_server_cert.py | 3 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_ca_server_cert.py | 3 |
2 files changed, 6 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 c85bbc205..958498754 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]) 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]) |