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

Fix docker image grains pillar #54166

Merged
merged 3 commits into from Dec 20, 2019
Merged

Conversation

waynew
Copy link
Contributor

@waynew waynew commented Aug 9, 2019

What does this PR do?

Adds grains and pillar information to the thin client loaded onto docker images/containers

What issues does this PR fix or reference?

#53401

Previous Behavior

Grains were not getting set, so they were falling back to the default of the minion that was building the docker image. Pillar data was also not properly getting updated.

New Behavior

Grains + pillars are getting set

Tests written?

Yes

Commits signed with GPG?

Yes

@waynew waynew requested a review from as a code owner Aug 9, 2019
@ghost ghost requested a review from Ch3LL Aug 9, 2019
@doesitblend
Copy link
Contributor

@doesitblend doesitblend commented Aug 27, 2019

@waynew @dwoz I can confirm that this patch works in 2019.2.0.

Will this be in the 2019.2.1 release?

@waynew waynew force-pushed the fix-docker-image-grains-pillar branch from a84b017 to 8249765 Compare Aug 27, 2019
@waynew
Copy link
Contributor Author

@waynew waynew commented Aug 27, 2019

@dwoz tests are written now

@waynew waynew changed the title [WIP] Fix docker image grains pillar Fix docker image grains pillar Aug 27, 2019
@waynew waynew force-pushed the fix-docker-image-grains-pillar branch 2 times, most recently from e3956ba to 4f6eed4 Compare Aug 27, 2019
dwoz
dwoz approved these changes Aug 27, 2019
Ch3LL
Ch3LL approved these changes Sep 3, 2019
Without this, the thin client that's passed to the docker container
won't contain the proper grain/pillar information.
@waynew waynew force-pushed the fix-docker-image-grains-pillar branch from 4f6eed4 to ea21006 Compare Nov 14, 2019
@waynew waynew changed the base branch from neon to master Nov 14, 2019
@dwoz
Copy link
Contributor

@dwoz dwoz commented Dec 17, 2019

@waynew please address the linter and docs failures

@dwoz dwoz merged commit 0937a3a into saltstack:master Dec 20, 2019
48 of 49 checks passed
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.

None yet

6 participants