diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-03 17:09:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 17:09:50 -0500 |
| commit | c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a (patch) | |
| tree | 182c37f192c8bec3f190fe57ff7d974c9d96ef8d /roles/openshift_master_certificates | |
| parent | 87b0f005ee280540ec7afbd39f1a6b99a4c60ea3 (diff) | |
| parent | 917e871843192b107776ce8459b87f3960e455ed (diff) | |
| download | openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.gz openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.bz2 openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.xz openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.zip | |
Merge pull request #2671 from abutcher/cert-redeploy-restructure
Restructure certificate redeploy playbooks
Diffstat (limited to 'roles/openshift_master_certificates')
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml index 4620dd877..7a5ed51ec 100644 --- a/roles/openshift_master_certificates/tasks/main.yml +++ b/roles/openshift_master_certificates/tasks/main.yml @@ -38,12 +38,22 @@ when: master_certs_missing | bool and inventory_hostname != openshift_ca_host delegate_to: "{{ openshift_ca_host }}" +- find: + paths: "{{ openshift_master_config_dir }}/legacy-ca/" + patterns: ".*-ca.crt" + use_regex: true + register: g_master_legacy_ca_result + delegate_to: "{{ openshift_ca_host }}" + - name: Create the master server certificate command: > {{ hostvars[openshift_ca_host].openshift.common.client_binary }} adm ca create-server-cert {% for named_ca_certificate in openshift.master.named_certificates | default([]) | oo_collect('cafile') %} --certificate-authority {{ named_ca_certificate }} {% endfor %} + {% for legacy_ca_certificate in g_master_legacy_ca_result.files | default([]) | oo_collect('path') %} + --certificate-authority {{ legacy_ca_certificate }} + {% endfor %} --hostnames={{ hostvars[item].openshift.common.all_hostnames | join(',') }} --cert={{ openshift_generated_configs_dir }}/master-{{ hostvars[item].openshift.common.hostname }}/master.server.crt --key={{ openshift_generated_configs_dir }}/master-{{ hostvars[item].openshift.common.hostname }}/master.server.key |