summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-24 10:23:25 -0400
committerGitHub <noreply@github.com>2016-08-24 10:23:25 -0400
commit6b97248962da142512a5783d58cda5da50b21360 (patch)
tree717b1e6fdab35f9687c58e9a19920d39afeb0950
parente395341212dea911a2fbc932102ca032057c5ff4 (diff)
parentca2239d0364ba60e43f071424c36063789bc11cb (diff)
downloadopenshift-6b97248962da142512a5783d58cda5da50b21360.tar.gz
openshift-6b97248962da142512a5783d58cda5da50b21360.tar.bz2
openshift-6b97248962da142512a5783d58cda5da50b21360.tar.xz
openshift-6b97248962da142512a5783d58cda5da50b21360.zip
Merge pull request #2354 from abutcher/ca-rt
Correct masterCA config typo
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 31e86f5bd..e9beed3b3 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -173,7 +173,7 @@ oauthConfig:
{% if openshift.common.version_gte_3_2_or_1_2 | bool %}
masterCA: ca-bundle.crt
{% else %}
- masterCA: ca.rt
+ masterCA: ca.crt
{% endif %}
masterPublicURL: {{ openshift.master.public_api_url }}
masterURL: {{ openshift.master.api_url }}
@@ -210,7 +210,7 @@ serviceAccountConfig:
{% if openshift.common.version_gte_3_2_or_1_2 | bool %}
masterCA: ca-bundle.crt
{% else %}
- masterCA: ca.rt
+ masterCA: ca.crt
{% endif %}
privateKeyFile: serviceaccounts.private.key
publicKeyFiles: