summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-29 15:31:42 -0500
committerGitHub <noreply@github.com>2017-03-29 15:31:42 -0500
commit6f0c06028dae9b277de409f7bc7eebca5c9bd29e (patch)
tree108af18675c3d7c2d5c1856ba0d96c3d9976f5ec /playbooks/common
parent403b5c5545b9b07e7a4416e5a63609512ddaa224 (diff)
parent638e4198f80e6e2705c7a5e865e7d39112d1f42a (diff)
downloadopenshift-6f0c06028dae9b277de409f7bc7eebca5c9bd29e.tar.gz
openshift-6f0c06028dae9b277de409f7bc7eebca5c9bd29e.tar.bz2
openshift-6f0c06028dae9b277de409f7bc7eebca5c9bd29e.tar.xz
openshift-6f0c06028dae9b277de409f7bc7eebca5c9bd29e.zip
Merge pull request #3581 from php-coder/set_cert_expiration_date
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates/registry.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml
index 08ebfe735..e82996cf4 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml
@@ -69,6 +69,9 @@
--hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}"
--cert={{ openshift.common.config_base }}/master/registry.crt
--key={{ openshift.common.config_base }}/master/registry.key
+ {% if openshift_version | oo_version_gte_3_5_or_1_5(openshift.common.deployment_type) | bool %}
+ --expire-days={{ openshift_hosted_registry_cert_expire_days | default(730) }}
+ {% endif %}
- name: Update registry certificates secret
oc_secret: