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 the bins_dir to default to pg_bin #37946

Merged
merged 3 commits into from
Nov 29, 2016

Conversation

scott-w
Copy link
Contributor

@scott-w scott-w commented Nov 29, 2016

What does this PR do?

Updates the configuration to match the documentation. Originally the docs said postgres.pg_bin was the config to update, however the code looks at postgres.bins_dir. This PR supports both behaviours so we can transition users who need an immediate fix away from the original workaround.

I've also updated the documentation so we can be clear that the behavior is unsupported but is necessary in certain situations.

What issues does this PR fix or reference?

#37935

Previous Behavior

The system only looked in postgres.bins_dir in the configuration. The docs said to update postgres.pg_bin

New Behavior

The system defaults to look at postgres.pg_bin first, then falls back to postgres.bins_dir to prevent workarounds failing.

Tests written?

No

@gtmanfred
Copy link
Contributor

Can you deprecate this using the warn_until function

https://docs.saltstack.com/en/latest/topics/development/deprecations.html

@scott-w
Copy link
Contributor Author

scott-w commented Nov 29, 2016

@gtmanfred Yeah no worries. What version should I put in?

@gtmanfred
Copy link
Contributor

I would say Oxygen.

@ticosax
Copy link
Contributor

ticosax commented Nov 29, 2016

Thank for this,
Please can you rebase this pull request against 2016.11 branch ? I think, it is more a regression fix rather than a new feature. It is a blocker to upgrade saltstack on some linux distros.

@scott-w
Copy link
Contributor Author

scott-w commented Nov 29, 2016

Hi @ticosax yeah, I'll do that now. I'll close this PR.

@scott-w scott-w closed this Nov 29, 2016
@ticosax
Copy link
Contributor

ticosax commented Nov 29, 2016

You don't have to close it. click on EDIT button and change the base branch.

@scott-w scott-w reopened this Nov 29, 2016
@scott-w scott-w changed the base branch from develop to 2016.11 November 29, 2016 15:31
@scott-w
Copy link
Contributor Author

scott-w commented Nov 29, 2016

Ahh yeah, I've not used this in Github before yet :P

@ticosax
Copy link
Contributor

ticosax commented Nov 29, 2016

Doens't seem to work like I expected. Sorry. I'm afraid you will have to submit a new patch.

Scott Walton added 2 commits November 29, 2016 15:39
The config looking for initdb wasn't consistent with documentation so this updates that. It might be best to add a default but I need to look into the code a bit more first.
@scott-w scott-w force-pushed the 37935-fix-bin-dir branch 2 times, most recently from c53e4d7 to a041b9f Compare November 29, 2016 15:42
Realised I missed off the initdb check so I've restored it as before.
@scott-w
Copy link
Contributor Author

scott-w commented Nov 29, 2016

@ticosax There we go, I've gotten rid of the extraneous commits from develop :)

@cachedout cachedout merged commit 36f9140 into saltstack:2016.11 Nov 29, 2016
@scott-w scott-w deleted the 37935-fix-bin-dir branch November 29, 2016 17:00
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.

4 participants