summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-07-21 16:16:47 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-07-21 16:16:47 -0400
commit63699feb49b03f2acd9f2705743480172381b913 (patch)
treea5446d7babd7edebbcca217b44a8d7dd3185b5eb
parent0cbeae4df062af3e2c1a4cb08ef3b4e742394ed6 (diff)
parentc1641d686610f12f2590d2c1dbea5e3967d807f4 (diff)
downloadopenshift-63699feb49b03f2acd9f2705743480172381b913.tar.gz
openshift-63699feb49b03f2acd9f2705743480172381b913.tar.bz2
openshift-63699feb49b03f2acd9f2705743480172381b913.tar.xz
openshift-63699feb49b03f2acd9f2705743480172381b913.zip
Merge pull request #378 from sdodson/issue333
Add masterCA to ServiceAccountConfig
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index bc766ec9b..5e46f8f69 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -107,6 +107,7 @@ serviceAccountConfig:
- default
- builder
- deployer
+ masterCA: ca.crt
privateKeyFile: serviceaccounts.private.key
publicKeyFiles:
- serviceaccounts.public.key