Merge pull request #430 from saltstack-formulas/ryanwalder-patch-1
fix(minion): Add 'return' to reserved_keys in minion config
This commit is contained in:
		
						commit
						5778238244
					
				| @ -1,7 +1,7 @@ | ||||
| # This file managed by Salt, do not edit by hand!! | ||||
| #  Based on salt version 2016.11 default config | ||||
| # | ||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors'] -%} | ||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors', 'return'] -%} | ||||
| {% set cfg_salt = pillar.get('salt', {}) -%} | ||||
| {% set cfg_minion = cfg_salt.get('minion', {}) -%} | ||||
| {% set default_keys = [] -%} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Niels Abspoel
						Niels Abspoel