summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates/master.yaml.v1.j2
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-03 14:09:42 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-04 09:16:11 -0500
commit9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2 (patch)
tree751b98c15e57c828d84eecb9a3f086133f53178e /roles/openshift_master/templates/master.yaml.v1.j2
parentfb1b9ff7d3293c821a8569ae95dcc8a98dfbf967 (diff)
downloadopenshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.gz
openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.bz2
openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.xz
openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.zip
Clean up idempotency issues with session secrets.
Diffstat (limited to 'roles/openshift_master/templates/master.yaml.v1.j2')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 5f73461d4..da3209970 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -127,7 +127,9 @@ oauthConfig:
sessionConfig:
sessionMaxAgeSeconds: {{ openshift.master.session_max_seconds }}
sessionName: {{ openshift.master.session_name }}
+{% if openshift.master.session_auth_secrets is defined and openshift.master.session_encryption_secrets is defined %}
sessionSecretsFile: {{ openshift.master.session_secrets_file }}
+{% endif %}
tokenConfig:
accessTokenMaxAgeSeconds: {{ openshift.master.access_token_max_seconds }}
authorizeTokenMaxAgeSeconds: {{ openshift.master.auth_token_max_seconds }}