diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-03 17:09:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 17:09:50 -0500 |
| commit | c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a (patch) | |
| tree | 182c37f192c8bec3f190fe57ff7d974c9d96ef8d /roles/openshift_master | |
| parent | 87b0f005ee280540ec7afbd39f1a6b99a4c60ea3 (diff) | |
| parent | 917e871843192b107776ce8459b87f3960e455ed (diff) | |
| download | openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.gz openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.bz2 openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.tar.xz openshift-c8ddd41e0f1819cd9a23a0b5679b8d0360aec92a.zip | |
Merge pull request #2671 from abutcher/cert-redeploy-restructure
Restructure certificate redeploy playbooks
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index cf7ceacff..9ae54dac1 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -102,7 +102,11 @@ imagePolicyConfig:{{ openshift.master.image_policy_config | to_padded_yaml(level kind: MasterConfig kubeletClientInfo: {# TODO: allow user specified kubelet port #} +{% if openshift.common.version_gte_3_2_or_1_2 | bool %} + ca: ca-bundle.crt +{% else %} ca: ca.crt +{% endif %} certFile: master.kubelet-client.crt keyFile: master.kubelet-client.key port: 10250 @@ -221,7 +225,11 @@ servingInfo: bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} bindNetwork: tcp4 certFile: master.server.crt +{% if openshift.common.version_gte_3_2_or_1_2 | bool %} + clientCA: ca-bundle.crt +{% else %} clientCA: ca.crt +{% endif %} keyFile: master.server.key maxRequestsInFlight: {{ openshift.master.max_requests_inflight }} requestTimeoutSeconds: 3600 |