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

Bring up ext_pillar rendering errors as well #31380

Merged
merged 1 commit into from Feb 23, 2016
Merged

Conversation

kiorky
Copy link
Contributor

@kiorky kiorky commented Feb 20, 2016

i dont know if that can go in 2015.8 considering the non trivial change.

Idea is to also bring the errors from ext_pillars inside the _errors subdict for pillar to bring errors as with static sls files.

Indeed, for now, the errors show up inside logs, but up then, as this is just a log, anything will be ignored, sls will execute and etc, even if the pillar is lacking critical information to run

@kiorky
Copy link
Contributor Author

kiorky commented Feb 20, 2016

cc @regilero

'''
Extract the sls pillar files from the matches and render them into the
pillar
'''
if errors is None:
errors = []
pillar = copy.copy(self.pillar_override)
errors = []
Copy link
Member

Choose a reason for hiding this comment

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

You're resetting errors to an empty list here. Looking at the code above, I believe this is not the desired behavior...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, this line is a reliquat from previous code, it should go off, yes., ill update it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@s0undt3ch updated. nice catchup btw.

@cachedout
Copy link
Contributor

Hi @kiorky I agree with the suggestion that this should not go into a point release. Could you please close this and re-submit against the develop branch? Thanks.

@cachedout cachedout added the Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged label Feb 22, 2016
@kiorky
Copy link
Contributor Author

kiorky commented Feb 23, 2016

@cachedout may i let you cherrypick & test this on develop, and do any additional fixup commit that i can review ?
We here not more use develop, so i cant test it intensively, i checked the develop branch, and normally, the same changeset would apply without a glitch, i can ofc make a PR against develop, but well, it will be hard to test it correctly in real situation. (we all now that salt test suite is good, but not 100% ^^)

@kiorky
Copy link
Contributor Author

kiorky commented Feb 23, 2016

(To be clear, our fork is now based on 2015.8, for now)

@kiorky
Copy link
Contributor Author

kiorky commented Feb 23, 2016

So tell me if you want from me to initiate the PR against develop or if you want to do it yourself.

@kiorky
Copy link
Contributor Author

kiorky commented Feb 23, 2016

BTW, @cachedout @s0undt3ch after reflexion,
i'm not sure that this can't go into 2015.x afterall because we can consider that not throwing errors when ext pillar rendering is incomplete is also a CRITICAL bug that must be fixed.
This is not the case today, and for example SLS can execute with lack of data, resulting into incomplete/improper configurations.

Idea is now to clearly distinguish if this is a so-evil changeset or not, for me it's good, but indeed the more expert eyes, the better.

@cachedout
Copy link
Contributor

Hi @kiorky

I see what you're saying here. It's reasonable to classify the lack of error notification a bug, especially in a pillar as you mention. I will merge this on this branch. Thanks for the discussion.

cachedout pushed a commit that referenced this pull request Feb 23, 2016
Bring up ext_pillar rendering errors as well
@cachedout cachedout merged commit 30d968c into saltstack:2015.8 Feb 23, 2016
@kiorky kiorky deleted the p branch April 10, 2017 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pending-Discussion The issue or pull request needs more discussion before it can be closed or merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants