diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-19 22:50:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 22:50:01 -0500 |
| commit | 22dfad7ae3492cf949871981e3a84bcefbd138f0 (patch) | |
| tree | 0cc147de46cfca141fe56f594ef37595cf6cc780 | |
| parent | 6f842a55108544c80454120ff778e11bbb3de529 (diff) | |
| parent | ebb1b751b9623eb2f9b265737e6d032ba5c5da3c (diff) | |
| download | openshift-22dfad7ae3492cf949871981e3a84bcefbd138f0.tar.gz openshift-22dfad7ae3492cf949871981e3a84bcefbd138f0.tar.bz2 openshift-22dfad7ae3492cf949871981e3a84bcefbd138f0.tar.xz openshift-22dfad7ae3492cf949871981e3a84bcefbd138f0.zip | |
Merge pull request #4226 from mtnbikenc/fix-auditConfig
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 938ac2a12..ef0256af9 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -44,10 +44,10 @@ assetConfig: - {{ cipher_suite }} {% endfor %} {% endif %} -{% if openshift_master_ha | bool %} {% if openshift.master.audit_config | default(none) is not none and openshift.common.version_gte_3_2_or_1_2 | bool %} auditConfig:{{ openshift.master.audit_config | to_padded_yaml(level=1) }} {% endif %} +{% if openshift_master_ha | bool %} controllerLeaseTTL: {{ openshift.master.controller_lease_ttl | default('30') }} {% endif %} {% if openshift.common.version_gte_3_3_or_1_3 | bool %} |