diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
| commit | fcbb48362afb6e9ed196d7833940877bbc0296ae (patch) | |
| tree | d0bce8760facae32438342007cb568afcf27e3ad /roles/openshift_master_certificates | |
| parent | 2f02c464904551e8018e0afc47bcde850ed8d0f1 (diff) | |
| parent | 05458ecde01c9c1ade9d1a5216bc7621a92b9d6f (diff) | |
| download | openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.gz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.bz2 openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.xz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.zip | |
Merge pull request #731 from abutcher/proxy-client-config
Add proxy client certs to master config
Diffstat (limited to 'roles/openshift_master_certificates')
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml index 0d75a9eb3..e4602337e 100644 --- a/roles/openshift_master_certificates/tasks/main.yml +++ b/roles/openshift_master_certificates/tasks/main.yml @@ -20,6 +20,8 @@ - admin.kubeconfig - master.kubelet-client.crt - master.kubelet-client.key + - "{{ 'master.proxy-client.crt' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}" + - "{{ 'master.proxy-client.key' if openshift.common.version_greater_than_3_1_or_1_1 else omit }}" - openshift-master.crt - openshift-master.key - openshift-master.kubeconfig @@ -41,6 +43,5 @@ --public-master={{ item.openshift.master.public_api_url }} --cert-dir={{ openshift_generated_configs_dir }}/{{ item.master_cert_subdir }} --overwrite=false - args: - creates: "{{ openshift_generated_configs_dir }}/{{ item.master_cert_subdir }}/master.server.crt" + when: master_certs_missing with_items: masters_needing_certs |