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 /playbooks/common/openshift-cluster/redeploy-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 'playbooks/common/openshift-cluster/redeploy-certificates')
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/registry.yml | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml index e22c8cbdb..eb225dfb5 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml @@ -1,11 +1,4 @@ --- -- name: Verify OpenShift version is greater than or equal to 1.2 or 3.2 - hosts: oo_first_master - tasks: - - fail: - msg: "The current OpenShift version is less than 1.2/3.2 and does not support CA bundles." - when: not openshift.common.version_gte_3_2_or_1_2 | bool - - name: Check cert expirys hosts: oo_nodes_to_config:oo_masters_to_config:oo_etcd_to_config vars: diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml index afd5463b2..7e9363c5f 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml @@ -70,9 +70,7 @@ --hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc,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: |