Skip to content

[master] Allow accessing the regular mine/event bus from salt-ssh - #65646

Merged
dwoz merged 1 commit into
saltstack:masterfrom
lkubb:salt-ssh-regular-mine-publish
Dec 12, 2023
Merged

dwoz merged 1 commit into
saltstack:masterfrom
lkubb:salt-ssh-regular-mine-publish

Conversation

@lkubb

@lkubb lkubb commented Nov 29, 2023 •

Copy link
Copy Markdown
Contributor

What does this PR do?

  • Allows the mine wrapper to access the regular mine
  • Allows the publish wrapper to access the regular event bus

What issues does this PR fix or reference?

Fixes: #40943
Fixes: #65645

Note:

  • The second issue asks for this functionality in the title, but assumes it would make the x509.certificate_managed state work on SSH minions. This is not the case. The publish wrapper can be used to emulate its behavior somewhat though by writing a wrapper for the x509 execution module.
  • This also fixes an issue where passing non-string arg to publish.publish for SSH minions just crashes: {'retcode': 1, 'stderr': 'Traceback (most recent call last):\n File "<string>", line 2, in <module>\n File "<string>", line 427, in <module>\n File "<string>", line 384, in main\nAttributeError: \'int\' object has no attribute \'startswith\'\n', 'stdout': '/usr/bin/scp\n'}

Previous Behavior

salt-ssh and regular Salt are strictly separated, except during pillar rendering

New Behavior

Data from regular Salt can be accessed in salt-ssh

Merge requirements satisfied?

Commits signed with GPG?

Yes

@lkubb
lkubb marked this pull request as ready for review December 8, 2023 08:07
@lkubb
lkubb requested a review from a team as a code owner December 8, 2023 08:07
@lkubb
lkubb requested review from dwoz and removed request for a team December 8, 2023 08:07
@dwoz
dwoz merged commit caea12e into saltstack:master Dec 12, 2023
@lkubb lkubb mentioned this pull request Jan 31, 2024
1 of 3 tasks

This branch was previously deployed

1 inactive deployment
ci — 892de82d Deployed Dec 8, 2023 by lkubb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants