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

git_pillar: Fix all_saltenvs on base env #51597

Closed
wants to merge 2 commits into from

Conversation

@sathieu
Copy link
Contributor

commented Feb 12, 2019

What does this PR do?

Fixes #50768.

What issues does this PR fix or reference?

PR #50768.

Previous Behavior

minion:
    Data failed to compile:
----------
    Pillar failed to render with the following messages:
----------
    Specified SLS 'projects.gitlab' in environment 'prod' is not available on the salt master

New Behavior

State applies succesfully.

Tests written?

No

Commits signed with GPG?

Yes

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

After #51317 was merged, the following was not matching any pillar_dir:

            pillar_roots.extend(
                [d for (d, e) in six.iteritems(git_pillar.pillar_dirs)
                 if env == e and d != pillar_dir]
            )

because e = base and env = prod (i.e the all_saltenvs value)

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

@terminalmage please review

Copy link
Contributor

left a comment

@saltstack/team-core are we still accepting pull requests to the 2018.3.4 branch?

@sathieu sathieu force-pushed the sathieu:fix50768 branch from be66dde to 50c6509 Feb 12, 2019
@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 12, 2019

Please accept this for 2018.3.4, otherwise #50768 is broken.

@thatch45

This comment has been minimized.

Copy link
Member

commented Feb 13, 2019

We are not, it is in final freeze. Does this only impact the all_saltenvs feature?

Also, am I reading this right? Did we accept a feature into 2018.3.4?

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 13, 2019

@thatch45 this only impact the all_saltenvs feature, which was implemented in #50768 for git_pillar but is in gifts since 2018.3.0.

@thatch45

This comment has been minimized.

Copy link
Member

commented Feb 13, 2019

Thank you for the clarification, I am afraid that it would stall the release quite a bit at this point to get this in.

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 13, 2019

Sad. Would this mean that a known broken feature will be is 2018.3.4? Maybe it's better to revert it then?

@thatch45

This comment has been minimized.

Copy link
Member

commented Feb 13, 2019

as it is a very new feature I think it is worth pointing it out, but I think we should be fine. Sorry this did not get in in time! The point release was already past due....

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Feb 14, 2019

OK. Thanks for releasing it soon.

I will make a new PR on the 2018.3 branch and hope 2018.3.5 and 2019.2.1 will come soon.

@dwoz

This comment has been minimized.

Copy link
Contributor

commented Feb 15, 2019

@sathieu Since you are going to create a new PR to 2018.3, I'm closing this one. Thanks for understanding we're pushing 2018.3.4 as soon as possible.

@dwoz dwoz closed this Feb 15, 2019
@sathieu sathieu deleted the sathieu:fix50768 branch Mar 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.