diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 13:12:22 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 16:52:35 -0400 |
| commit | 5aff702d10b79822098ca68f9ee3184be45775d7 (patch) | |
| tree | b73fee43fd694ecb78eddb887eee9d817da9d68f /roles/openshift_master_certificates | |
| parent | 7f5c403e144e6ef4d39bf7b11adb4c4a8976521c (diff) | |
| download | openshift-5aff702d10b79822098ca68f9ee3184be45775d7.tar.gz openshift-5aff702d10b79822098ca68f9ee3184be45775d7.tar.bz2 openshift-5aff702d10b79822098ca68f9ee3184be45775d7.tar.xz openshift-5aff702d10b79822098ca68f9ee3184be45775d7.zip | |
Don't include proxy client cert when <3.1 or <1.1
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..87e8181c1 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.master.include_proxy_client_cert else omit }}" + - "{{ 'master.proxy-client.key' if openshift.master.include_proxy_client_cert 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 |