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

fallback to ext_pillar in pillar match if there is no pillar in __opts__ #55624

Merged
merged 2 commits into from
Jan 6, 2020
Merged

fallback to ext_pillar in pillar match if there is no pillar in __opts__ #55624

merged 2 commits into from
Jan 6, 2020

Conversation

vquie
Copy link
Contributor

@vquie vquie commented Dec 12, 2019

What does this PR do?

If there is 'pillar' in __opts__ the matchers would break. This PR determines if there is a 'pillar' object and uses 'ext_pillar' if there is none.

What issues does this PR fix or reference?

#52567

Previous Behavior

Previously the matcher would just call __opts__['pillar'].

New Behavior

The matcher checks for __opts__['pillar']. If there is none, it calls __opts__['ext_pillar'] instead.

Tests written?

No

Commits signed with GPG?

No

@vquie vquie requested a review from a team as a code owner December 12, 2019 17:22
@ghost ghost requested a review from xeacott December 12, 2019 17:22
@codecov
Copy link

codecov bot commented Dec 12, 2019

Codecov Report

Merging #55624 into master will increase coverage by 1.09%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #55624      +/-   ##
==========================================
+ Coverage    17.7%   18.79%   +1.09%     
==========================================
  Files         784      817      +33     
  Lines      168394   175189    +6795     
  Branches    36188    37590    +1402     
==========================================
+ Hits        29805    32913    +3108     
- Misses     136569   139704    +3135     
- Partials     2020     2572     +552
Flag Coverage Δ
#archlts 18.07% <ø> (+0.37%) ⬆️
#centos7 23.64% <ø> (?)
#proxy 23.68% <ø> (?)
#py2 18.57% <ø> (?)
#py3 18.42% <ø> (+0.72%) ⬆️
#runtests 18.79% <ø> (+1.09%) ⬆️
#ubuntu1604 23.63% <ø> (?)
#zeromq 18.79% <ø> (+1.09%) ⬆️
Impacted Files Coverage Δ
salt/modules/glusterfs.py 12.18% <0%> (-0.03%) ⬇️
salt/modules/nspawn.py 17.43% <0%> (-0.03%) ⬇️
salt/utils/dns.py 18.36% <0%> (-0.03%) ⬇️
salt/modules/azurearm_network.py 8.7% <0%> (-0.02%) ⬇️
salt/modules/win_lgpo.py 6.56% <0%> (ø) ⬇️
salt/modules/boto_elasticache.py 9.95% <0%> (ø) ⬆️
salt/modules/boto3_route53.py 9.93% <0%> (ø) ⬆️
salt/utils/zeromq.py 48% <0%> (ø) ⬆️
salt/utils/configparser.py 14.19% <0%> (ø) ⬆️
salt/modules/win_file.py 16.67% <0%> (ø) ⬆️
... and 153 more

@dwoz
Copy link
Contributor

dwoz commented Jan 6, 2020

re-run full centos

@dwoz dwoz merged commit 3e58366 into saltstack:master Jan 6, 2020
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.

2 participants