summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-14 15:12:42 -0400
committerGitHub <noreply@github.com>2016-07-14 15:12:42 -0400
commit1a6b1bf010b661feb8495d4088f9a0f2640b5658 (patch)
tree411fd31b0624514a7ea0aed32de3a2a1234b45d2 /roles/openshift_master
parentfaf5618ec483baa7618f02de91128e8f1eaaa471 (diff)
parent0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed (diff)
downloadopenshift-1a6b1bf010b661feb8495d4088f9a0f2640b5658.tar.gz
openshift-1a6b1bf010b661feb8495d4088f9a0f2640b5658.tar.bz2
openshift-1a6b1bf010b661feb8495d4088f9a0f2640b5658.tar.xz
openshift-1a6b1bf010b661feb8495d4088f9a0f2640b5658.zip
Merge pull request #2149 from detiber/audit_config
[master] add support for setting auditConfig
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 17a10ae71..b18a42e32 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -39,6 +39,9 @@ assetConfig:
maxRequestsInFlight: 0
requestTimeoutSeconds: 0
{% 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 %}
controllerLeaseTTL: {{ openshift.master.controller_lease_ttl | default('30') }}
{% endif %}
controllers: '*'