diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-31 17:21:23 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-14 16:45:59 -0500 |
| commit | 346ce4fc595ed618e589666a87b441b40e392e73 (patch) | |
| tree | b1ff902f89fad74466bcbab7c0d334a49cb7d813 /roles/openshift_master_certificates | |
| parent | a7462fda03cd9a749f20f0e5885b3dedefd0447e (diff) | |
| download | openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.gz openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.bz2 openshift-346ce4fc595ed618e589666a87b441b40e392e73.tar.xz openshift-346ce4fc595ed618e589666a87b441b40e392e73.zip | |
Removed old version code
This commit removes any references to versions < 1.5/3.5
We assume the version is always greater than or equal to 1.5/3.5.
Diffstat (limited to 'roles/openshift_master_certificates')
| -rw-r--r-- | roles/openshift_master_certificates/tasks/main.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml index d9ffb1b6f..ec1fbb1ee 100644 --- a/roles/openshift_master_certificates/tasks/main.yml +++ b/roles/openshift_master_certificates/tasks/main.yml @@ -3,7 +3,7 @@ openshift_master_certs_no_etcd: - admin.crt - master.kubelet-client.crt - - "{{ 'master.proxy-client.crt' if openshift.common.version_gte_3_1_or_1_1 else omit }}" + - master.proxy-client.crt - master.server.crt - openshift-master.crt - openshift-registry.crt @@ -57,9 +57,7 @@ --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 - {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %} --expire-days={{ openshift_master_cert_expire_days }} - {% endif %} --signer-cert={{ openshift_ca_cert }} --signer-key={{ openshift_ca_key }} --signer-serial={{ openshift_ca_serial }} @@ -87,9 +85,7 @@ --signer-serial={{ openshift_ca_serial }} --user=system:openshift-master --basename=openshift-master - {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %} --expire-days={{ openshift_master_cert_expire_days }} - {% endif %} args: creates: "{{ openshift_generated_configs_dir }}/master-{{ hostvars[item].openshift.common.hostname }}/openshift-master.kubeconfig" with_items: "{{ hostvars |