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

git_pillar: Allow root and mountpoint parameters together #50626

Merged

Conversation

Projects
None yet
4 participants
@sathieu
Copy link
Contributor

commented Nov 24, 2018

What does this PR do?

It allows to specify both mountpoint and root parameters.

What issues does this PR fix or reference?

Fixes: #50364

Previous Behavior

Consider the following master config:

ext_pillar:
  - git:
    - master https://mydomain.tld/top.git:
      - root: pillar
      - mountpoint: ''
    - master https://mydomain.tld/myapp1.git:
      - root: pillar/myapp1
      - mountpoint: myapp1
    - master https://mydomain.tld/myapp2.git:
      - root: pillar/myapp2
      - mountpoint: myapp2

The root parameter is ignored.

New Behavior

The root parameter is properly applied.

Tests written?

Yes

Commits signed with GPG?

Yes

@sathieu sathieu requested a review from saltstack/team-core as a code owner Nov 24, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Nov 24, 2018

@sathieu sathieu force-pushed the sathieu:git_pillar_mountpoint_and_root branch from 0b4023c to e59a1ec Nov 24, 2018

@cachedout cachedout requested a review from terminalmage Nov 26, 2018

Show resolved Hide resolved salt/utils/gitfs.py Outdated

@sathieu sathieu force-pushed the sathieu:git_pillar_mountpoint_and_root branch from e59a1ec to aa88f3c Nov 28, 2018

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Nov 28, 2018

@sathieu This has caused quite a few test failures. Could you please investigate?

@sathieu sathieu force-pushed the sathieu:git_pillar_mountpoint_and_root branch from aa88f3c to 0beac9a Nov 28, 2018

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 28, 2018

@cachedout Fixed.

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Nov 29, 2018

Thanks, @sathieu. I would like to have @terminalmage look at this before it goes in but I think we're just about there. :)

@sathieu sathieu force-pushed the sathieu:git_pillar_mountpoint_and_root branch from 0beac9a to 5423c27 Dec 5, 2018

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Dec 5, 2018

@terminalmage Do you have the time to review?

@terminalmage terminalmage merged commit 60aa0d5 into saltstack:2018.3 Dec 5, 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 Python lint test 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

@sathieu sathieu deleted the sathieu:git_pillar_mountpoint_and_root branch Dec 5, 2018

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.