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

Honor roster system for ssh orchestrations #51170

Merged
merged 5 commits into from Jan 19, 2019

Conversation

Projects
None yet
4 participants
@dwoz
Copy link
Contributor

commented Jan 14, 2019

What does this PR do?

Honor roster file when passed to orchestration state.

What issues does this PR fix or reference?

#51158

Tests written?

Yes

Commits signed with GPG?

Yes

dwoz added some commits Jan 14, 2019

@@ -284,6 +284,8 @@ def state(name,

cmd_kw['tgt_type'] = tgt_type
cmd_kw['ssh'] = ssh
if 'roster' in kwargs:
cmd_kw['roster_file'] = kwargs['roster']

This comment has been minimized.

Copy link
@AndreiPashkin

AndreiPashkin Jan 15, 2019

Contributor

roster argument refers to roster-system, not roster-file. "Roster-file" is relevant within "flat" roster system, but Salt allows other roster-systems to be used including custom ones.

This comment has been minimized.

Copy link
@dwoz

dwoz Jan 15, 2019

Author Contributor

The documentation says that roster for the orchestration state refers to a roster file. This PR is just to make the state honor what the documentation says. Passing the roster_file keyword arg to saltutil.cmd uses the default roster value of flat

This comment has been minimized.

Copy link
@AndreiPashkin

AndreiPashkin Jan 16, 2019

Contributor

The documentation says that roster for the orchestration state refers to a roster file.

Not it's not:

roster
In the event of using salt-ssh, a roster system can be set

https://docs.saltstack.com/en/latest/ref/states/all/salt.states.saltmod.html#salt.states.saltmod.state
Notice - roster system, not roster file

This comment has been minimized.

Copy link
@dwoz

dwoz Jan 16, 2019

Author Contributor

Okay, thanks for pointing that out. I'll look at this again.

This comment has been minimized.

Copy link
@dwoz

dwoz Jan 18, 2019

Author Contributor

@AndreiPashkin Are we good here?

This comment has been minimized.

Copy link
@AndreiPashkin

AndreiPashkin Jan 19, 2019

Contributor

@dwoz, yeah, it seems so.

@dwoz dwoz changed the title Honor roster file for ssh orchestrations Honor roster system for ssh orchestrations Jan 16, 2019

dwoz added some commits Jan 16, 2019

@@ -284,6 +284,8 @@ def state(name,

cmd_kw['tgt_type'] = tgt_type
cmd_kw['ssh'] = ssh
if 'roster' in kwargs:
cmd_kw['roster_file'] = kwargs['roster']

This comment has been minimized.

Copy link
@AndreiPashkin

AndreiPashkin Jan 19, 2019

Contributor

@dwoz, yeah, it seems so.

@dwoz dwoz merged commit d5acd5b into saltstack:2018.3 Jan 19, 2019

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

dwoz added a commit that referenced this pull request Jan 27, 2019

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.