Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #51677 to master #55637

Merged
merged 11 commits into from
Dec 14, 2019
Merged

Backport #51677 to master #55637

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
16ea106
Modify config.option to scan grains, and also support wildcards
terminalmage Feb 15, 2019
c31a2fc
Use config.option instead of config.get or minion opts
terminalmage Feb 15, 2019
1539c64
Add note regarding change in behavior
terminalmage Feb 15, 2019
64719e3
Remove obsolete defaults
terminalmage Feb 15, 2019
a4cdcad
Add new tests for updated config.option function
terminalmage Feb 15, 2019
14821b8
Add omit_all option
terminalmage Feb 15, 2019
5e8e1aa
lint
terminalmage Feb 15, 2019
ac456c4
Update tests to reflect recent changes
Jun 17, 2019
b742352
Add execution driver to config.option defaults
Jun 18, 2019
a24862e
Update integration tests to reflect recent changes
Jun 18, 2019
3bb54e9
Add a comment to keep someone from trying to use SHELL_FALSE_PATH
Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove obsolete defaults 
These now reside in salt.modules.config.DEFAULTS
  • Loading branch information
@terminalmage
terminalmage authored and Erik Johnson committed Dec 13, 2019
commit 64719e34a5ed8a0f9003bf1981f9ce77a5f472a2
8 changes: 0 additions & 8 deletions salt/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,9 +1169,6 @@ def _gather_buffer_space():
# Subconfig entries can be specified by using the ':' notation (e.g. key:subkey)
'pass_to_ext_pillars': (six.string_types, list),

# Used by salt.modules.dockermod.compare_container_networks to specify which keys are compared
'docker.compare_container_networks': dict,

# SSDP discovery publisher description.
# Contains publisher configuration and minion mapping.
# Setting it to False disables discovery
Expand Down Expand Up @@ -1482,11 +1479,6 @@ def _gather_buffer_space():
'extmod_whitelist': {},
'extmod_blacklist': {},
'minion_sign_messages': False,
'docker.compare_container_networks': {
'static': ['Aliases', 'Links', 'IPAMConfig'],
'automatic': ['IPAddress', 'Gateway',
'GlobalIPv6Address', 'IPv6Gateway'],
},
'discovery': False,
'schedule': {},
'ssh_merge_pillar': True
Expand Down