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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix file config extra_vars options loading #1372

Merged
merged 4 commits into from Feb 18, 2021
Merged

Fix file config extra_vars options loading #1372

merged 4 commits into from Feb 18, 2021

Conversation

skarzi
Copy link
Contributor

@skarzi skarzi commented Feb 18, 2021

In #1342 extra_vars option was added to the file config, but it's not properly loaded (sorry, I should add a test for this in the before-mentioned PR 馃槥).
This PR fixes extra_vars option loading by updating merge_config function - now all file config options that wasn't declared in bool, scalar_map or lists_map variable are merged into cli_config.

@skarzi skarzi marked this pull request as ready for review February 18, 2021 09:34
@ssbarnea ssbarnea changed the title fix file config extra_vars options loading Fix file config extra_vars options loading Feb 18, 2021
@ssbarnea ssbarnea added the bug label Feb 18, 2021
@ssbarnea ssbarnea self-requested a review February 18, 2021 10:19
@ssbarnea ssbarnea merged commit 384b863 into ansible:master Feb 18, 2021
@jrgoldfinemiddleton
Copy link

Thanks, this one was biting me. Thought I was going crazy.

@skarzi skarzi deleted the fix/options/extra_vars-loading branch February 23, 2021 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants