diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-07 14:26:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 14:26:40 -0500 |
| commit | 7061d6d06221796b314d59893cd03516bd0f896a (patch) | |
| tree | f90c01aa44519cfdf945982ef354fa15a821a704 /roles | |
| parent | 4fe53adf947c7d202f0fc53569891af322e2a5f3 (diff) | |
| parent | a966744c5729cc98154ce8712a9d5e979ced203b (diff) | |
| download | openshift-7061d6d06221796b314d59893cd03516bd0f896a.tar.gz openshift-7061d6d06221796b314d59893cd03516bd0f896a.tar.bz2 openshift-7061d6d06221796b314d59893cd03516bd0f896a.tar.xz openshift-7061d6d06221796b314d59893cd03516bd0f896a.zip | |
Merge pull request #7007 from abutcher/master-cert-idempotence
Correct master certificates list checked by openshift_master_certificates
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml index ce27e238f..a92b63979 100644 --- a/roles/openshift_master_certificates/tasks/main.yml +++ b/roles/openshift_master_certificates/tasks/main.yml @@ -1,25 +1,16 @@ --- -- set_fact: - openshift_master_certs_no_etcd: - - admin.crt - - master.kubelet-client.crt - - master.proxy-client.crt - - master.server.crt - - openshift-master.crt - - openshift-registry.crt - - openshift-router.crt - - etcd.server.crt - openshift_master_certs_etcd: - - master.etcd-client.crt - -- set_fact: - openshift_master_certs: "{{ (openshift_master_certs_no_etcd | union(openshift_master_certs_etcd )) if openshift_master_etcd_hosts | length > 0 else openshift_master_certs_no_etcd }}" - - name: Check status of master certificates stat: path: "{{ openshift_master_config_dir }}/{{ item }}" with_items: - - "{{ openshift_master_certs }}" + - admin.crt + - ca.crt + - ca-bundle.crt + - master.kubelet-client.crt + - master.proxy-client.crt + - master.server.crt + - openshift-master.crt + - service-signer.crt register: g_master_cert_stat_result when: not openshift_certificates_redeploy | default(false) | bool |