Merge pull request #14453 from Security-Onion-Solutions/x509v2_fix

patch x509_v2 state salt issue 66929

salt/salt/minion.sls

@@ -8,6 +8,7 @@
 
 include:
   - salt.python_modules
+  - salt.patch.x509_v2
   - salt
   - systemd.reload
   - repo.client

salt/salt/patch/x509_v2/init.sls

@@ -0,0 +1,6 @@
+patch_x509_v2_state_module:
+  file.replace:
+    - name: /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py
+    - pattern: 'res = __salt__\["state.single"\]\("file.managed", name, test=test, \*\*kwargs\)'
+    - repl: 'res = __salt__["state.single"]("file.managed", name, test=test, concurrent=True, **kwargs)'
+    - backup: .bak

setup/so-functions

@@ -1960,11 +1960,8 @@ salt_install_module_deps() {
 }
 
 salt_patch_x509_v2() {
-	# this can be removed when https://github.com/saltstack/salt/issues/64195 is resolved
+	# this can be removed when https://github.com/saltstack/salt/issues/66929 is resolved
-	if [ $SALTVERSION == "3006.1" ]; then
+	logCmd "salt-call state.apply salt.patch.x509_v2 --local --file-root=../salt/"
-		info "Salt version 3006.1 found. Patching /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py"
-		\cp -v ./files/patch/states/x509_v2.py /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py
-	fi
 }
 
 # Create an secrets pillar so that passwords survive re-install