diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-13 08:21:56 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-10-13 08:21:56 -0400 |
| commit | a3531efc4cbe6d514666c5c52a6971749f5f3379 (patch) | |
| tree | 45a7fbdd76464179f36d7c55d7cc587c8a6e91b8 /roles | |
| parent | 060ed13a880bd776578e6726c49e2224403ca0f3 (diff) | |
| parent | 8c21fffe2e97154d4938bd823098b0814f989001 (diff) | |
| download | openshift-a3531efc4cbe6d514666c5c52a6971749f5f3379.tar.gz openshift-a3531efc4cbe6d514666c5c52a6971749f5f3379.tar.bz2 openshift-a3531efc4cbe6d514666c5c52a6971749f5f3379.tar.xz openshift-a3531efc4cbe6d514666c5c52a6971749f5f3379.zip | |
Merge pull request #680 from liggitt/master_ca
Add masterCA to oauth template
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/v1_partials/oauthConfig.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/v1_partials/oauthConfig.j2 b/roles/openshift_master/templates/v1_partials/oauthConfig.j2 index 72889bc29..8a4f5a746 100644 --- a/roles/openshift_master/templates/v1_partials/oauthConfig.j2 +++ b/roles/openshift_master/templates/v1_partials/oauthConfig.j2 @@ -80,6 +80,7 @@ oauthConfig: provider: {{ identity_provider_config(identity_provider) }} {%- endfor %} + masterCA: ca.crt masterPublicURL: {{ openshift.master.public_api_url }} masterURL: {{ openshift.master.api_url }} sessionConfig: |