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 state.sls_id not running on ssh minion #48555

Merged
merged 3 commits into from Jul 16, 2018

Conversation

Projects
None yet
6 participants
@Ch3LL
Contributor

Ch3LL commented Jul 12, 2018

What does this PR do?

state.sls_id was running on the master and not the salt-ssh minion. This PR makes sure we are running the state on the salt-ssh minion. I noticed we are calling a lot of the same functions in the state.py wrapper for salt-ssh so I created this funciton: _ssh_state. I hope to move the other ones to this but in develop to make sure we don't ruin something in a point release once this is merged forward

What issues does this PR fix or reference?

#48318

Tests written?

Yes

Commits signed with GPG?

Yes

Ch3LL added some commits Jul 11, 2018

@salt-jenkins salt-jenkins requested review from saltstack/team-core Jul 12, 2018

@rallytime

LGTM

@rallytime rallytime merged commit 61572b6 into saltstack:2017.7 Jul 16, 2018

10 of 16 checks passed

jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11383 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6413 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24341 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20466 — FAILURE
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26628 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18658 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23294 — SUCCESS
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/py3-centos-7 The py3-centos-7 job has passed
Details
@@ -32,6 +32,60 @@
log = logging.getLogger(__name__)
def _ssh_state(chunks, __opts__, __context__, __pillar__, __salt__, st_kwargs,

This comment has been minimized.

@cachedout

cachedout Jul 16, 2018

Contributor

I'm very confused by this. Why are we taking in __opts__ and __context__ etc as arguments for this function when they should already be available in this namespace?

This comment has been minimized.

@isbm

isbm Jul 17, 2018

Contributor

And __pillar__. Can we fix this, @Ch3LL ?

)
# Create the tar containing the state pkg and relevant files.
trans_tar = salt.client.ssh.state.prep_trans_tar(
__opts__,

This comment has been minimized.

@isbm

isbm Jul 17, 2018

Contributor

@Ch3LL This is unused inside the function. I'd propose either remove the option entirely from prep_trans_tar or refactor that it is used.

@@ -32,6 +32,60 @@
log = logging.getLogger(__name__)
def _ssh_state(chunks, __opts__, __context__, __pillar__, __salt__, st_kwargs,

This comment has been minimized.

@isbm

isbm Jul 17, 2018

Contributor

And __pillar__. Can we fix this, @Ch3LL ?

@Ch3LL

This comment has been minimized.

Contributor

Ch3LL commented Jul 17, 2018

i'll try to follow up on this today if not today tomorrow. i created an issue here: #48621 just so i don't forget

Ch3LL added a commit to Ch3LL/salt that referenced this pull request Jul 17, 2018

@Ch3LL Ch3LL referenced this pull request Jul 17, 2018

Merged

Follow up to PR #48555 #48625

rallytime added a commit that referenced this pull request Jul 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment