diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-14 15:12:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 15:12:42 -0400 |
| commit | 1a6b1bf010b661feb8495d4088f9a0f2640b5658 (patch) | |
| tree | 411fd31b0624514a7ea0aed32de3a2a1234b45d2 /roles | |
| parent | faf5618ec483baa7618f02de91128e8f1eaaa471 (diff) | |
| parent | 0fc1c77cc0dcbf314b34a957d150d4aced7fe8ed (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 |
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) }}" |