summaryrefslogtreecommitdiffstats
path: root/roles/openshift_ca
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-15 14:06:31 -0500
committerGitHub <noreply@github.com>2017-11-15 14:06:31 -0500
commitbedbf78b8d2a71bd11301b555aa7a3c34c7bac5c (patch)
treebe25d717c47f8e5b2ef495f15d9cedc32c8b15d2 /roles/openshift_ca
parent719e608f81fbf539da0dca16234ef271b9cbe3d3 (diff)
parent346ce4fc595ed618e589666a87b441b40e392e73 (diff)
downloadopenshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.gz
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.bz2
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.tar.xz
openshift-bedbf78b8d2a71bd11301b555aa7a3c34c7bac5c.zip
Merge pull request #5968 from mgugino-upstream-stage/version-scrub
Removed old version code
Diffstat (limited to 'roles/openshift_ca')
-rw-r--r--roles/openshift_ca/tasks/main.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/roles/openshift_ca/tasks/main.yml b/roles/openshift_ca/tasks/main.yml
index 587526d07..31f0f8e7a 100644
--- a/roles/openshift_ca/tasks/main.yml
+++ b/roles/openshift_ca/tasks/main.yml
@@ -97,10 +97,8 @@
--master={{ openshift.master.api_url }}
--public-master={{ openshift.master.public_api_url }}
--cert-dir={{ openshift_ca_config_dir }}
- {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %}
--expire-days={{ openshift_master_cert_expire_days }}
--signer-expire-days={{ openshift_ca_cert_expire_days }}
- {% endif %}
--overwrite=false
when: master_ca_missing | bool or openshift_certificates_redeploy | default(false) | bool
delegate_to: "{{ openshift_ca_host }}"
@@ -169,9 +167,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 %}
- name: Copy generated loopback master client config to master config dir
copy:
src: "{{ openshift_ca_loopback_tmpdir.stdout }}/{{ item }}"