diff options
| author | Russell Teague <rteague@redhat.com> | 2018-02-05 16:16:46 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2018-02-05 16:28:09 -0500 |
| commit | 43138470ca05806403bd9ad1b99e0e581307b191 (patch) | |
| tree | 31542be8dd869678172382ae01b7290555baf42e /playbooks/common | |
| parent | 90f577883066f7213afca2a1159c69cabece57dc (diff) | |
| download | openshift-43138470ca05806403bd9ad1b99e0e581307b191.tar.gz openshift-43138470ca05806403bd9ad1b99e0e581307b191.tar.bz2 openshift-43138470ca05806403bd9ad1b99e0e581307b191.tar.xz openshift-43138470ca05806403bd9ad1b99e0e581307b191.zip | |
Move cert SAN update logic to openshift-etcd
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 9b5ba3482..baec057f9 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -3,29 +3,6 @@ # Upgrade Masters ############################################################################### -# Prior to 3.6, openshift-ansible created etcd serving certificates -# without a SubjectAlternativeName entry for the system hostname. The -# SAN list in Go 1.8 is now (correctly) authoritative and since -# openshift-ansible configures masters to talk to etcd hostnames -# rather than IP addresses, we must correct etcd certificates. -# -# This play examines the etcd serving certificate SANs on each etcd -# host and records whether or not the system hostname is missing. -- name: Examine etcd serving certificate SAN - hosts: oo_etcd_to_config - tasks: - - slurp: - src: /etc/etcd/server.crt - register: etcd_serving_cert - - set_fact: - __etcd_cert_lacks_hostname: "{{ (openshift.common.hostname not in (etcd_serving_cert.content | b64decode | lib_utils_oo_parse_certificate_san)) | bool }}" - -# Redeploy etcd certificates when hostnames were missing from etcd -# serving certificate SANs. -- import_playbook: ../../../openshift-etcd/redeploy-certificates.yml - when: - - true in hostvars | lib_utils_oo_select_keys(groups['oo_etcd_to_config']) | lib_utils_oo_collect('__etcd_cert_lacks_hostname') | default([false]) - - name: Backup and upgrade etcd import_playbook: ../../../openshift-etcd/private/upgrade_main.yml |