[3006.x] Move grain_opts to subdict to prevent overwriting core grains

saltstack / salt

Software to automate the management and configuration of any infrastructure or application at scale. Install Salt from the Salt package repositories here:

https://docs.saltproject.io/salt/install-guide/en/latest/

Apache License 2.0

14.2k stars 5.48k forks source link

[3006.x] Move grain_opts to subdict to prevent overwriting core grains #66785

Closed terminalmage closed 2 months ago

terminalmage commented 3 months ago

What does this PR do?

Moves the grains added when grain_opts: True is set in the minion config into a subdict.

What issues does this PR fix or reference?

Fixes #66784

Merge requirements satisfied?

[ ] Docs
[x] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
[x] Tests written/updated

saltstack / salt

[3006.x] Move grain_opts to subdict to prevent overwriting core grains #66785

What does this PR do?

What issues does this PR fix or reference?

Merge requirements satisfied?

Commits signed with GPG?