Merge pull request aboe76#5 from lewispeckover/master

update master and minion configs from Salt source
rschemm-godaddy · Nov 1, 2014 · 39901df · 39901df
2 parents 0a9e4d5 + 314a84f
commit 39901df
Show file tree

Hide file tree

Showing 7 changed files with 587 additions and 199 deletions.
diff --git a/manifests/master.pp b/manifests/master.pp
@@ -28,16 +28,28 @@
   $master_timeout               = $salt::params::master_timeout,
   $master_loop_interval         = $salt::params::master_loop_interval,
   $master_output                = $salt::params::master_output,
+  $master_show_timeout          = $salt::params::master_show_timeout,
   $master_color                 = $salt::params::master_color,
+  $master_strip_colors          = $salt::params::master_strip_colors,
   $master_sock_dir              = $salt::params::master_sock_dir,
+  $master_enable_gpu_grains     = $salt::params::master_enable_gpu_grains,
   $master_job_cache             = $salt::params::master_job_cache,
   $master_minion_data_cache     = $salt::params::master_minion_data_cache,
-  $master_show_timeout          = $salt::params::master_show_timeout,
+  $master_max_event_size        = $salt::params::master_max_event_size,
+  $master_ping_on_rotate        = $salt::params::master_ping_on_rotate,
+  $master_preserve_minion_cache = $salt::params::master_preserve_minion_cache,
+  $master_con_cache             = $salt::params::master_con_cache,
   # master security:
   $master_open_mode             = $salt::params::master_open_mode,
   $master_auto_accept           = $salt::params::master_auto_accept,
+  $master_autosign_timeout      = $salt::params::master_autosign_timeout,
   $master_autosign_file         = $salt::params::master_autosign_file,
+  $master_autoreject_file       = $salt::params::master_autoreject_file,
   $master_permissive_pki_access = $salt::params::master_permissive_pki_access,
+  $master_token_expire          = $salt::params::master_token_expire,
+  $master_file_recv             = $salt::params::master_file_recv,
+  $master_file_recv_max_size    = $salt::params::master_file_recv_max_size,
+  $master_sign_pub_messages     = $salt::params::master_sign_pub_messages,
   # master module management
   $master_cython_enable         = $salt::params::master_cython_enable,
   # master state system settings
@@ -47,6 +59,8 @@
   $master_failhard              = $salt::params::master_failhard,
   $master_state_verbose         = $salt::params::master_state_verbose,
   $master_state_output          = $salt::params::master_state_output,
+  $master_jinja_trim_blocks     = $salt::params::master_jinja_trim_blocks,
+  $master_jinja_lstrip_blocks   = $salt::params::master_jinja_lstrip_blocks,
   # master file server settings
   $master_hash_type             = $salt::params::master_hash_type,
   $master_file_buffer_size      = $salt::params::master_file_buffer_size,

diff --git a/manifests/master/config.pp b/manifests/master/config.pp
@@ -19,16 +19,28 @@
   $master_timeout               = $salt::master::master_timeout,
   $master_loop_interval         = $salt::master::master_loop_interval,
   $master_output                = $salt::master::master_output,
+  $master_show_timeout          = $salt::master::master_show_timeout,
   $master_color                 = $salt::master::master_color,
+  $master_strip_colors          = $salt::master::master_strip_colors,
   $master_sock_dir              = $salt::master::master_sock_dir,
+  $master_enable_gpu_grains     = $salt::master::master_enable_gpu_grains,
   $master_job_cache             = $salt::master::master_job_cache,
   $master_minion_data_cache     = $salt::master::master_minion_data_cache,
-  $master_show_timeout          = $salt::master::master_show_timeout,
+  $master_max_event_size        = $salt::master::master_max_event_size,
+  $master_ping_on_rotate        = $salt::master::master_ping_on_rotate,
+  $master_preserve_minion_cache = $salt::master::master_preserve_minion_cache,
+  $master_con_cache             = $salt::master::master_con_cache,
   # master security:
   $master_open_mode             = $salt::master::master_open_mode,
   $master_auto_accept           = $salt::master::master_auto_accept,
+  $master_autosign_timeout      = $salt::master::master_autosign_timeout,
   $master_autosign_file         = $salt::master::master_autosign_file,
+  $master_autoreject_file       = $salt::master::master_autoreject_file,
   $master_permissive_pki_access = $salt::master::master_permissive_pki_access,
+  $master_token_expire          = $salt::master::master_token_expire,
+  $master_file_recv             = $salt::master::master_file_recv,
+  $master_file_recv_max_size    = $salt::master::master_file_recv_max_size,
+  $master_sign_pub_messages     = $salt::master::master_sign_pub_messages,
   # master module management
   $master_cython_enable         = $salt::master::master_cython_enable,
   # master state system settings
@@ -38,6 +50,8 @@
   $master_failhard              = $salt::master::master_failhard,
   $master_state_verbose         = $salt::master::master_state_verbose,
   $master_state_output          = $salt::master::master_state_output,
+  $master_jinja_trim_blocks     = $salt::master::master_jinja_trim_blocks,
+  $master_jinja_lstrip_blocks   = $salt::master::master_jinja_lstrip_blocks,
   # master file server settings
   $master_hash_type             = $salt::master::master_hash_type,
   $master_file_buffer_size      = $salt::master::master_file_buffer_size,

diff --git a/manifests/minion.pp b/manifests/minion.pp
@@ -13,6 +13,7 @@
   $minion_service_manage  = $salt::params::minion_service_manage,
   $minion_service_name    = $salt::params::minion_service_name,
   $minion_master          = $salt::params::minion_master,
+  $minion_random_master   = $salt::params::minion_random_master,
   $minion_ipv6            = $salt::params::minion_ipv6,
   $minion_retry_dns       = $salt::params::minion_retry_dns,
   $minion_master_port     = $salt::params::minion_master_port,
@@ -23,17 +24,36 @@
   $minion_id              = $salt::params::minion_id,
   $minion_append_domain   = $salt::params::minion_append_domain,
   $minion_cachedir        = $salt::params::minion_cachedir,
+  $minion_verify_env      = $salt::params::minion_verify_env,
+  $minion_cache_jobs      = $salt::params::minion_cache_jobs,
   $minion_sock_dir        = $salt::params::minion_sock_dir,
   $minion_output          = $salt::params::minion_output,
   $minion_color           = $salt::params::minion_color,
+  $minion_strip_colors    = $salt::params::minion_strip_colors,
   $minion_acceptance_wait_time     = $salt::params::minion_acceptance_wait_time,
+  $minion_acceptance_wait_time_max = $salt::params::minion_acceptance_wait_time_max,
+  $minion_rejected_retry  = $salt::params::minion_rejected_retry,
+  $minion_random_reauth_delay      = $salt::params::minion_random_reauth_delay,
+  $minion_auth_timeout    = $salt::params::minion_auth_timeout,
+  $minion_auth_tries      = $salt::params::minion_auth_tries,
+  $minion_auth_safemode   = $salt::params::minion_auth_safemode,
+  $minion_ping_interval   = $salt::params::minion_ping_interval,
+  $minion_recon_default   = $salt::params::minion_recon_default,
+  $minion_recon_max       = $salt::params::minion_recon_max,
+  $minion_recon_randomize = $salt::params::minion_recon_randomize,
   $minion_loop_interval   = $salt::params::minion_loop_interval,
   $minion_dns_check       = $salt::params::minion_dns_check,
+  $minion_grains_refresh_every     = $salt::params::minion_grains_refresh_every,
+  $minion_grains_cache    = $salt::params::minion_grains_cache,
+  $minion_grains_cache_expiration  = $salt::params::minion_grains_cache_expiration,
   $minion_ipc_mode        = $salt::params::minion_ipc_mode,
   $minion_tcp_pub_port    = $salt::params::minion_tcp_pub_port,
   $minion_tcp_pull_port   = $salt::params::minion_tcp_pull_port,
+  $minion_max_event_size  = $salt::params::minion_max_event_size,
+  $minion_master_alive_interval    = $salt::params::minion_master_alive_interval,
   # minion module management
   $minion_cython_enable   = $salt::params::minion_cython_enable,
+  $minion_modules_max_memory       = $salt::params::minion_modules_max_memory,
   # minion state management settings
   $minion_renderer        = $salt::params::minion_renderer,
   $minion_failhard        = $salt::params::minion_failhard,
@@ -59,6 +79,8 @@
   $minion_log_level_logfile        = $salt::params::minion_log_level_logfile,
   # minion file server settings
   $minion_hash_type       = $salt::params::minion_hash_type,
+  $minion_fileserver_limit_traversal        = $salt::params::minion_fileserver_limit_traversal,
+  $minion_state_output_diff        = $salt::params::minion_state_output_diff,
   # minion keepalive settings
   $minion_tcp_keepalive   = $salt::params::minion_tcp_keepalive,
   $minion_tcp_keepalive_idle       = $salt::params::minion_tcp_keepalive_idle,

diff --git a/manifests/minion/config.pp b/manifests/minion/config.pp
@@ -4,6 +4,7 @@
   $minion_config    = $salt::minion::minion_config,
   $minion_template  = $salt::minion::minion_config_template,
   $minion_master    = $salt::minion::minion_master,
+  $minion_random_master   = $salt::minion::minion_random_master,
   $minion_ipv6      = $salt::minion::minion_ipv6,
   $minion_retry_dns = $salt::minion::minion_retry_dns,
   $minion_master_port              = $salt::minion::minion_master_port,
@@ -14,17 +15,36 @@
   $minion_id        = $salt::minion::minion_id,
   $minion_append_domain            = $salt::minion::minion_append_domain,
   $minion_cachedir  = $salt::minion::minion_cachedir,
+  $minion_verify_env       = $salt::minion::minion_verify_env,
+  $minion_cache_jobs       = $salt::minion::minion_cache_jobs,
   $minion_sock_dir  = $salt::minion::minion_sock_dir,
   $minion_output    = $salt::minion::minion_output,
   $minion_color     = $salt::minion::minion_color,
+  $minion_strip_colors    = $salt::minion::minion_strip_colors,
+  $minion_acceptance_wait_time_max = $salt::minion::minion_acceptance_wait_time_max,
   $minion_acceptance_wait_time     = $salt::minion::minion_acceptance_wait_time,
+  $minion_rejected_retry  = $salt::minion::minion_rejected_retry,
+  $minion_random_reauth_delay      = $salt::minion::minion_random_reauth_delay,
+  $minion_auth_timeout    = $salt::minion::minion_auth_timeout,
+  $minion_auth_tries      = $salt::minion::minion_auth_tries,
+  $minion_auth_safemode   = $salt::minion::minion_auth_safemode,
+  $minion_ping_interval   = $salt::minion::minion_ping_interval,
+  $minion_recon_default    = $salt::minion::minion_recon_default,
+  $minion_recon_max        = $salt::minion::minion_recon_max,
+  $minion_recon_randomize  = $salt::minion::minion_recon_randomize,
   $minion_loop_interval            = $salt::minion::minion_loop_interval,
   $minion_dns_check = $salt::minion::minion_dns_check,
+  $minion_grains_refresh_every     = $salt::minion::minion_grains_refresh_every,
+  $minion_grains_cache    = $salt::minion::minion_grains_cache,
+  $minion_grains_cache_expiration  = $salt::minion::minion_grains_cache_expiration,
   $minion_ipc_mode  = $salt::minion::minion_ipc_mode,
   $minion_tcp_pub_port             = $salt::minion::minion_tcp_pub_port,
   $minion_tcp_pull_port            = $salt::minion::minion_tcp_pull_port,
+  $minion_max_event_size  = $salt::minion::minion_max_event_size,
+  $minion_master_alive_interval    = $salt::minion::minion_master_alive_interval,
   # minion module management
   $minion_cython_enable            = $salt::minion::minion_cython_enable,
+  $minion_modules_max_memory       = $salt::minion::minion_modules_max_memory,
   # minion state management settings
   $minion_renderer  = $salt::minion::minion_renderer,
   $minion_failhard  = $salt::minion::minion_failhard,
@@ -50,6 +70,8 @@
   $minion_log_level_logfile        = $salt::minion::minion_log_level_logfile,
   # minion file server settings
   $minion_hash_type = $salt::minion::minion_hash_type,
+  $minion_fileserver_limit_traversal        = $salt::minion::minion_fileserver_limit_traversal,
+  $minion_state_output_diff        = $salt::minion::minion_state_output_diff,
   # minion keepalive settings
   $minion_tcp_keepalive            = $salt::minion::minion_tcp_keepalive,
   $minion_tcp_keepalive_idle       = $salt::minion::minion_tcp_keepalive_idle,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -113,17 +113,29 @@
   $master_timeout = 5
   $master_loop_interval = 60
   $master_output = 'nested'
+  $master_show_timeout = false
   $master_color = true
+  $master_strip_colors = true
   $master_sock_dir = '/var/run/salt/master'
+  $master_enable_gpu_grains = false
   $master_job_cache = true
   $master_minion_data_cache = true
-  $master_show_timeout = false
+  $master_max_event_size = 1048576
+  $master_ping_on_rotate = false
+  $master_preserve_minion_cache = false
+  $master_con_cache = false
 
   # master security:
   $master_open_mode = false
   $master_auto_accept = false
+  $master_autosign_timeout = 120
   $master_autosign_file = '/etc/salt/autosign.conf'
+  $master_autoreject_file = '/etc/salt/autoreject.conf'
   $master_permissive_pki_access = false
+  $master_token_expire = 43200
+  $master_file_recv = false
+  $master_file_recv_max_size = 100
+  $master_sign_pub_messages = false
 
   # master module management
   $master_cython_enable = false
@@ -132,6 +144,8 @@
   $master_state_top = 'top.sls'
   $master_external_nodes = 'None'
   $master_renderer = 'yaml_jinja'
+  $master_jinja_trim_blocks = false
+  $master_jinja_lstrip_blocks = false
   $master_failhard = false
   $master_state_verbose = true
   $master_state_output = 'full'
@@ -150,6 +164,7 @@
   # minion defaults
   ###############################################
   $minion_master = 'salt'
+  $minion_random_master = false
   $minion_ipv6 = false
   $minion_retry_dns = 30
   $minion_master_port = $master_ret_port
@@ -160,18 +175,37 @@
   $minion_id = undef
   $minion_append_domain = undef
   $minion_cachedir = '/var/cache/salt/minion'
+  $minion_verify_env = true
+  $minion_cache_jobs = false
   $minion_sock_dir = '/var/run/salt/minion'
   $minion_output = 'nested'
   $minion_color = true
+  $minion_strip_colors  = true
   $minion_acceptance_wait_time = 10
+  $minion_acceptance_wait_time_max = 0
+  $minion_rejected_retry = false
+  $minion_random_reauth_delay = 10
+  $minion_auth_timeout = 60
+  $minion_auth_tries = 7
+  $minion_auth_safemode = false
+  $minion_ping_interval = 0
+  $minion_recon_default = 1000
+  $minion_recon_max = 10000
+  $minion_recon_randomize = true
   $minion_loop_interval = 60
   $minion_dns_check = true
+  $minion_grains_refresh_every = 0
+  $minion_grains_cache = false
+  $minion_grains_cache_expiration = 300
   $minion_ipc_mode = 'ipc'
   $minion_tcp_pub_port = 4510
   $minion_tcp_pull_port = 4511
+  $minion_max_event_size = 1048576
+  $minion_master_alive_interval = 0
 
   # minion module management
   $minion_cython_enable = false
+  $minion_modules_max_memory = -1
 
   # minion state management settings
   $minion_renderer = 'yaml_jinja'
@@ -193,6 +227,9 @@
 
   # File Directory Settings
   $minion_hash_type = md5
+  $minion_fileserver_limit_traversal = false
+  $minion_state_output_diff = false
+
   # minion logging settings
   $minion_log_file = '/var/log/salt/minion'
   $minion_key_logfile = '/var/log/salt/key'