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

Jump to bottom

Don't lay down all available opts #33385

Merged
merged 4 commits into from
May 20, 2016
Merged

Don't lay down all available opts #33385

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffc5ab4
Don't lay down all available opts
techhat May 19, 2016
4118318
We need at least one opt in there
techhat May 19, 2016
ba3700e
Condense defaults
techhat May 20, 2016
3458fa5
Put the default hash type back
techhat May 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions salt/utils/cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,13 @@ def minion_config(opts, vm_):
Return a minion's configuration for the provided options and VM
'''

# Let's get a copy of the salt minion default options
minion = copy.deepcopy(salt.config.DEFAULT_MINION_OPTS)
# Some default options are Null, let's set a reasonable default
minion.update(
log_level='info',
log_level_logfile='info',
hash_type='sha256'
)
# Don't start with a copy of the default minion opts; they're not always
# what we need. Some default options are Null, let's set a reasonable default
minion = {
'master': 'salt',
'log_level': 'info',
'hash_type': 'sha256',
}

# Now, let's update it to our needs
minion['id'] = vm_['name']
Expand Down