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

Never fall back to cfg_salt['master'] in minion config #179

Conversation

blast-hardcheese
Copy link
Contributor

if a special structure is required for master, it'll use whatever's defined in pillar.

Seems to resolve #178

@blast-hardcheese blast-hardcheese force-pushed the bugfix/178_master-configs-in-minion branch from cc8d2e7 to 963f4f2 Compare October 7, 2015 00:25
@blast-hardcheese
Copy link
Contributor Author

Do we know why this was originally written this way? Based on what I'm seeing, it should be able to be merged without worrying about breaking anything, since it's my understanding that its current implementation is broken

@blast-hardcheese blast-hardcheese force-pushed the bugfix/178_master-configs-in-minion branch from 963f4f2 to 52044d2 Compare October 20, 2015 06:22
@gravyboat
Copy link
Contributor

@blast-hardcheese Looks like this one slipped through the cracks. Do any of those old pieces provide support for an older jinja release? It's the only reason I can think it was originally written that way.

@blast-hardcheese blast-hardcheese force-pushed the bugfix/178_master-configs-in-minion branch 2 times, most recently from 6fcf97f to 12a4de1 Compare November 15, 2015 20:03
@blast-hardcheese blast-hardcheese changed the title No need for all the hoop-jumping Never fall back to cfg_salt['master'] Nov 15, 2015
@blast-hardcheese blast-hardcheese changed the title Never fall back to cfg_salt['master'] Never fall back to cfg_salt['master'] in minion config Nov 15, 2015
@blast-hardcheese
Copy link
Contributor Author

@gravyboat Digging through the commit history unearthed 23fd8b6, I think processing cfg_salt['master'] was an oversight when this was first added, since this could never work in a situation where you're running salt-minion on the master (which seems to be how this formula was designed to work, unless I'm mistaken)

@blast-hardcheese
Copy link
Contributor Author

Ah, one second-- found a failure case

- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
  `salt:minion:master`
@blast-hardcheese blast-hardcheese force-pushed the bugfix/178_master-configs-in-minion branch from 12a4de1 to d730d4f Compare November 15, 2015 20:11
@blast-hardcheese
Copy link
Contributor Author

@gravyboat OK, this is ready to go. Now, on my minion, if I don't specify salt:minion:master, it'll fall back to having # master: salt in the config (which is the correct behavior, compared to having all salt:master's properties listed as a giant array)

Also tested single and multi-master configs, seems to still work, so I think this is solid.

gravyboat added a commit that referenced this pull request Nov 15, 2015
…gs-in-minion

Never fall back to `cfg_salt['master']` in minion config
@gravyboat gravyboat merged commit 5c960fd into saltstack-formulas:master Nov 15, 2015
@gravyboat
Copy link
Contributor

Sounds good, thanks for getting this fixed up!

@blast-hardcheese blast-hardcheese deleted the bugfix/178_master-configs-in-minion branch November 15, 2015 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants