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 test mode for mount state if device_name_regex is used. #50409

Merged

Conversation

Projects
None yet
2 participants
@casselt
Copy link
Contributor

commented Nov 7, 2018

What does this PR do?

If mount.mounted is used for NFS or ceph-fuse, device_name_regex is
often needed to avoid remounting every time. If run with test=True, Salt
is always telling that it needs to remount while it is not remounting if
run with test=False. This commit changes the order of checks to first
check for a matching regex and then for the test mode and not the other
way around.

What issues does this PR fix or reference?

None

Tests written?

No

Commits signed with GPG?

Yes

Fix test mode for mount state if device_name_regex is used.
If mount.mounted is used for NFS or ceph-fuse, device_name_regex is
often needed to avoid remounting every time. If run with test=True, Salt
is always telling that it needs to remount while it is not remounting if
run with test=False. This commit changes the order of checks to first
check for a matching regex and then for the test mode and not the other
way around.

@rallytime rallytime merged commit d2fc910 into saltstack:2018.3 Nov 7, 2018

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.