Software to automate the management and configuration of any infrastructure or application at scale. Get access to the Salt software package repository here:

What does this PR do?

What issues does this PR fix or reference?

Fixes:

Previous Behavior

Remove this section if not relevant

New Behavior

Remove this section if not relevant

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• [ ] Docs
• [ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• [ ] Tests written/updated

Commits signed with GPG?

Yes/No

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Historically the __pillar__ dunder has never been available or worked in extension modules during pillar render, due to what I can only assume is a bug/oversight in the overly-complex mess of branches and logic in the pillar rendering code. Functionally there is very little reason this shouldn't work, and it even appears like it may have worked at some point, or at least was intended to work by the fact that the ext_pillar data was stuffed right back into opts before attempting to render the remainder of the pillar.

The missing piece to the puzzle here was that the partially-rendered ext_pillar data wasn't available in the opts dict packed into the salt.loader.minion_mods() call when it was generated, and the fact that the functions weren't reloaded after the pillar dict was updated. This commit fixes both of those things.

Ensure the minion_mods are always reloaded with the updated opts dict containing the partial pillar data when rendering pillar with ext_pillar_first enabled.

Signed-off-by: Joe Groocock [email protected]

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• [ ] Docs
• [x] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• [x] Tests written/updated

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Any minion option(s) can be overridden (note this is not a merge), and it can be specified multiple times to set multiple different options. The parser will also accept arbitrarily complex/deep data structures in python/json-compatible syntax. For example:

$ salt-call --local -o foo='["foo","bar"]' -o bar=1234 config.get foo
local:
    - foo
    - bar
$ salt-call --local -o foo='["foo","bar"]' -o bar=1234 config.get bar
local:
    1234

Signed-off-by: Joe Groocock [email protected]

What does this PR do?

Read the commit message

Merge requirements satisfied?

• [ ] Docs
• [x] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• [ ] Tests written/updated

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

mdraid complains loudly if you call raid.create with update= kwargs, even though they are entirely valid for raid.assemble. Given that the user can't influence whether the raid will be assembled or created, helpfully strip out invalid --update=.. args when not assembling an array to avoid any nasty surprises when the raid doesn't exist:

[INFO    ] Executing state udevraid.present for [/dev/md/all]
[INFO    ] Executing command mdadm in directory '/root'
[INFO    ] Executing command 'mdadm' in directory '/root'
[DEBUG   ] stderr: mdadm: No md superblock detected on /dev/mapper/luks-nvme0n1p2.
[DEBUG   ] retcode: 1
[INFO    ] Executing command 'mdadm' in directory '/root'
[DEBUG   ] stderr: mdadm: No md superblock detected on /dev/mapper/luks-nvme1n1p2.
[DEBUG   ] retcode: 1
[INFO    ] Executing command 'mdadm' in directory '/root'
[DEBUG   ] stderr: mdadm: No md superblock detected on /dev/mapper/luks-nvme2n1p2.
[DEBUG   ] retcode: 1
[INFO    ] Executing command mdadm in directory '/root'
[ERROR   ] Command 'mdadm' failed with return code: 2
[ERROR   ] stdout: mdadm: :option --update not valid in create mode
[ERROR   ] retcode: 2
[ERROR   ] Command 'mdadm' failed with return code: 2
[ERROR   ] output: mdadm: :option --update not valid in create mode
[INFO    ] Executing command mdadm in directory '/root'
[INFO    ] Executing command mdadm in directory '/root'
[INFO    ] Executing command '/bin/udevadm' in directory '/root'
[INFO    ] Executing command mdadm in directory '/root'
[ERROR   ] Raid /dev/md/all failed to be created.

Signed-off-by: Joe Groocock [email protected]

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

• [ ] Docs
• [ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
• [x] Tests written/updated

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

Description cmd_async method of salt.wheel.WheelClient throws "RuntimeError: The logging options have not been set yet" after upgrading the salt master version to 3005.1 from 3004.2. The complete error message below.

Failed to configure logging on <SignalHandlingProcess(ProcessFunc(AsyncClientMixin._proc_function_remote, fun=key.accept jid=20221228122743271807), started)>: The logging options have not been set yet. Traceback (most recent call last): File "/usr/lib/python3.6/site-packages/salt/utils/process.py", line 970, in wrapped_run_func salt._logging.setup_logging() File "/usr/lib/python3.6/site-packages/salt/_logging/impl.py", line 942, in setup_logging raise RuntimeError("The logging options have not been set yet.") RuntimeError: The logging options have not been set yet. {'tag': 'salt/wheel/20221228122743271807', 'jid': '20221228122743271807'}

Setup Salt-master and salt-api service 3005.1 Classic package service running on an Centos Servers hosted in Azure. Salt minion 2016.11.10 running an Centos machine. Using an Python salt Engine to automatically accept salt keys using salt's WheelClient. Pasting the WheelClient's code snippet below

wclient = salt.wheel.WheelClient(master_opts) return_data = wclient.cmd_async({'fun': 'key.accept', 'match': call_data['deviceId'],'eauth': 'pam','include_denied': True, 'username': pam_username,'password': pam_password })

NOTE: call_data comes from an api which has to the minion key which is referred as deviceid here.

Steps to Reproduce the behavior Configure the config file of an Minion to point to master running with version 3005.1. Start the minion service and then accept the key in master using the cmd_async module of salt.wheel.WheelClient. They minion key wont get accepeted and throw the below error.

>>> wclient.cmd_async({'fun': 'key.accept','match': 'TESTING_KEY_ACCEPTANCE_POST_SALT_UPGRADE_30051_TESTING2','eauth': 'pam','include_denied': True,'username': pam_username,'password': pam_password}) Failed to configure logging on <SignalHandlingProcess(ProcessFunc(AsyncClientMixin._proc_function_remote, fun=key.accept jid=20221228122753942755), started)>: The logging options have not been set yet. Traceback (most recent call last): File "/usr/lib/python3.6/site-packages/salt/utils/process.py", line 970, in wrapped_run_func salt._logging.setup_logging() File "/usr/lib/python3.6/site-packages/salt/_logging/impl.py", line 942, in setup_logging raise RuntimeError("The logging options have not been set yet.") RuntimeError: The logging options have not been set yet. {'tag': 'salt/wheel/20221228122753942755', 'jid': '20221228122753942755'}

Expected behavior They key must get accepted wihtout any errors. The same is working fine with cmd_sync.

Versions Report Salt master: (version 3005.1) `Salt Version: Salt: 3005.1

Dependency Versions: cffi: Not Installed cherrypy: unknown dateutil: 2.4.2 docker-py: Not Installed gitdb: Not Installed gitpython: Not Installed Jinja2: 2.11.1 libgit2: Not Installed M2Crypto: 0.35.2 Mako: Not Installed msgpack: 0.6.2 msgpack-pure: Not Installed mysql-python: Not Installed pycparser: Not Installed pycrypto: 2.6.1 pycryptodome: Not Installed pygit2: Not Installed Python: 3.6.8 (default, Nov 16 2020, 16:55:22) python-gnupg: Not Installed PyYAML: 3.13 PyZMQ: 18.0.1 smmap: Not Installed timelib: Not Installed Tornado: 4.5.3 ZMQ: 4.1.4

System Versions: dist: centos 7 Core locale: UTF-8 machine: x86_64 release: 3.10.0-1160.76.1.el7.x86_64 system: Linux version: CentOS Linux 7 Core`

Salt-minion: (version 2016.11.10) `Salt Version: Salt: 2016.11.10

Dependency Versions: cffi: 1.12.2 cherrypy: Not Installed dateutil: 2.8.0 docker-py: Not Installed gitdb: Not Installed gitpython: Not Installed ioflo: Not Installed Jinja2: 2.7.2 libgit2: Not Installed libnacl: Not Installed M2Crypto: Not Installed Mako: Not Installed msgpack-pure: Not Installed msgpack-python: 0.5.6 mysql-python: Not Installed pycparser: 2.19 pycrypto: 2.6.1 pycryptodome: Not Installed pygit2: Not Installed Python: 2.7.5 (default, Oct 30 2018, 23:45:53) python-gnupg: Not Installed PyYAML: 3.11 PyZMQ: 15.3.0 RAET: Not Installed smmap: Not Installed timelib: Not Installed Tornado: 4.2.1 ZMQ: 4.1.4

System Versions: dist: centos 7.6.1810 Core machine: x86_64 release: 3.10.0-957.5.1.el7.x86_64 system: Linux version: CentOS Linux 7.6.1810 Core`