diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-08-24 15:41:23 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-24 15:41:23 -0400 |
| commit | 05047e0e607598641eafac8eb8d9bbfa69bb7b2c (patch) | |
| tree | d7aaf091bdcf95abc4115546dddd8e953e27c856 /roles | |
| parent | fcaeaf0ebb4f858500717f5f85aa3e27218e3e0f (diff) | |
| download | openshift-05047e0e607598641eafac8eb8d9bbfa69bb7b2c.tar.gz openshift-05047e0e607598641eafac8eb8d9bbfa69bb7b2c.tar.bz2 openshift-05047e0e607598641eafac8eb8d9bbfa69bb7b2c.tar.xz openshift-05047e0e607598641eafac8eb8d9bbfa69bb7b2c.zip | |
enable service-serving-cert-signer by default
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index e9beed3b3..0430fc779 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -44,6 +44,13 @@ auditConfig:{{ openshift.master.audit_config | to_padded_yaml(level=1) }} {% endif %} controllerLeaseTTL: {{ openshift.master.controller_lease_ttl | default('30') }} {% endif %} +{% if openshift.common.version_gte_3_3_or_1_3 | bool %} +controllerConfig: + serviceServingCert: + signer: + certFile: service-signer.crt + keyFile: service-signer.key +{% endif %} controllers: '*' corsAllowedOrigins: {% for origin in ['127.0.0.1', 'localhost', openshift.common.ip, openshift.common.public_ip] | union(openshift.common.all_hostnames) | unique %} |