Browse Source

Raise max_event_size

Allows handling of large output (default 1mb, now 100mb)

Change-Id: Ic5c09155a14003747696c9974b19d21896bf881c
pull/56/head
Matthew Mosesohn 7 years ago
parent
commit
ce931cc163
8 changed files with 15 additions and 0 deletions
  1. +1
    -0
      metadata/service/master/cluster.yml
  2. +1
    -0
      metadata/service/master/single.yml
  3. +1
    -0
      metadata/service/minion/cluster.yml
  4. +1
    -0
      metadata/service/minion/local.yml
  5. +1
    -0
      metadata/service/minion/master.yml
  6. +4
    -0
      salt/files/master.conf
  7. +4
    -0
      salt/files/minion.conf
  8. +2
    -0
      salt/map.jinja

+ 1
- 0
metadata/service/master/cluster.yml View File

@@ -12,3 +12,4 @@ parameters:
engine: pkg
command_timeout: 5
worker_threads: 3
max_event_size: 100000000

+ 1
- 0
metadata/service/master/single.yml View File

@@ -14,4 +14,5 @@ parameters:
engine: pkg
command_timeout: 5
worker_threads: 3
max_event_size: 100000000
base_environment: ${_param:salt_master_base_environment}

+ 1
- 0
metadata/service/minion/cluster.yml View File

@@ -6,6 +6,7 @@ parameters:
salt:
minion:
enabled: true
max_event_size: 100000000
source:
engine: pkg
masters:

+ 1
- 0
metadata/service/minion/local.yml View File

@@ -6,6 +6,7 @@ parameters:
salt:
minion:
enabled: true
max_event_size: 100000000
source:
engine: pkg
local: true

+ 1
- 0
metadata/service/minion/master.yml View File

@@ -6,6 +6,7 @@ parameters:
salt:
minion:
enabled: true
max_event_size: 100000000
source:
engine: pkg
master:

+ 4
- 0
salt/files/master.conf View File

@@ -44,6 +44,10 @@ open_mode: True
auto_accept: True
{%- endif %}

{%- if master.get('max_event_size') %}
max_event_size: {{ master.max_event_size }}
{%- endif %}

{%- if master.pillar.engine == 'salt' %}

pillar_roots:

+ 4
- 0
salt/files/minion.conf View File

@@ -23,6 +23,10 @@ master: {{ minion.master.host }}

id: {{ system.name }}.{{ system.domain }}

{% if minion.get('max_event_size') %}
max_event_size: {{ minion.max_event_size }}
{%- endif %}

{%- set excluded_keys = ('master', 'system', 'public_keys', 'private_keys', 'known_hosts', '__reclass__', '_secret', '_param') %}

grains:

+ 2
- 0
salt/map.jinja View File

@@ -21,6 +21,7 @@ default:
files: /srv/salt/env
pillar:
engine: salt
max_event_size: 100000000
{%- endload %}

{%- load_yaml as master_specific %}
@@ -83,6 +84,7 @@ default:
{%- if pillar.salt.get('minion', {}).get('source', {}).version is defined %}
version: {{ pillar.salt.minion.source.version }}
{%- endif %}
max_event_size: 100000000
{%- endload %}

{%- load_yaml as minion_specific %}

Loading…
Cancel
Save