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.

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

Updated minion and master config files to 2016.11 #304

Merged
merged 1 commit into from
Apr 10, 2017

Conversation

javierbertoli
Copy link
Member

  • Added some missing parameters in both {master,minion}/f_defaults.conf files
  • Kept some backward compatible values (like hash_type: md5 instead of sha256) as changing them to new defaults is too disruptive (require cleaning caches, etc.)

Added parameters new to 2016.03 (or simply missing in the existing config).
Copy link
Member

@aboe76 aboe76 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@aboe76
Copy link
Member

aboe76 commented Apr 10, 2017

@nmadhok would you please take a look at see if you are also ok with this then we can merge it...

@nmadhok
Copy link
Member

nmadhok commented Apr 10, 2017

@aboe76 Looks good to me! I'll go ahead and merge. Thanks!

@nmadhok nmadhok merged commit 64925e9 into saltstack-formulas:master Apr 10, 2017
@nmadhok nmadhok self-requested a review April 10, 2017 14:05
# Note that enabling this feature means that minions will not be
# available to target for up to the length of the maintanence loop
# which by default is 60s.
{%- if cfg_minion['key_cache'] in cfg_master %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found a small oops...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be cfg_master...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should only be:

{{ get_config('key_cache', '') }}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants