diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-27 10:07:20 -0400 |
| commit | fcbb48362afb6e9ed196d7833940877bbc0296ae (patch) | |
| tree | d0bce8760facae32438342007cb568afcf27e3ad /roles/openshift_master | |
| parent | 2f02c464904551e8018e0afc47bcde850ed8d0f1 (diff) | |
| parent | 05458ecde01c9c1ade9d1a5216bc7621a92b9d6f (diff) | |
| download | openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.gz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.bz2 openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.xz openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.zip | |
Merge pull request #731 from abutcher/proxy-client-config
Add proxy client certs to master config
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 90234bacc..3e4f78b17 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -74,6 +74,9 @@ kubernetesMasterConfig: masterCount: 1 masterIP: "" podEvictionTimeout: "" + proxyClientInfo: + certFile: master.proxy-client.crt + keyFile: master.proxy-client.key schedulerConfigFile: {{ openshift_master_scheduler_conf }} servicesNodePortRange: "" servicesSubnet: {{ openshift.master.portal_net }} |