summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-07-13 12:20:09 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-07-13 17:40:19 -0400
commit0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed (patch)
tree1015a3d9f07f6b54ca526d95b0860d10f64344d5 /roles
parenta9870821719dfe28cd4b58dfe2709c39dc9cf4c9 (diff)
downloadopenshift-0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed.tar.gz
openshift-0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed.tar.bz2
openshift-0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed.tar.xz
openshift-0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed.zip
[master] add support for setting auditConfig
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j23
-rw-r--r--roles/openshift_master_facts/tasks/main.yml1
2 files changed, 4 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: '*'
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index 3aba774e5..17c31ec05 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -79,3 +79,4 @@
max_requests_inflight: "{{ openshift_master_max_requests_inflight | default(None) }}"
api_env_vars: "{{ openshift_master_api_env_vars | default(None) }}"
controllers_env_vars: "{{ openshift_master_controllers_env_vars | default(None) }}"
+ audit_config: "{{ openshift_master_audit_config | default(None) }}"