Merge branch 'v4' of github.com:jumpserver/jumpserver into v4

apps/terminal/automations/deploy_applet_host/playbook.yml

@@ -17,6 +17,7 @@
     TinkerInstaller: Tinker_Installer.exe
 
   tasks:
+    - block:
         - name: Install RDS-RD-Server (RDS)
           ansible.windows.win_feature:
             name: RDS-RD-Server
@@ -34,16 +35,6 @@
                $Ansible.Changed = $false
               }
 
-    - name: Stop Tinkerd before install (jumpserver)
-      ansible.windows.win_powershell:
-        script: |
-          if (Get-Service -Name 'JumpServer Tinker' -ErrorAction SilentlyContinue) {
-            Stop-Service -Name 'JumpServer Tinker' -Force
-          }
-          else {
-           $Ansible.Changed = $false
-          }
-
         - name: Download JumpServer Tinker installer (jumpserver)
           ansible.windows.win_get_url:
             url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/{{ TinkerInstaller }}"
@@ -92,8 +83,8 @@
               else {
                $Ansible.Changed = $true
               }
-      register: check_pip_command
           ignore_errors: yes
+          register: check_pip_command
 
         - name: Reboot if installing requires it
           ansible.windows.win_reboot:
@@ -273,3 +264,10 @@
           ansible.windows.win_powershell:
             script: |
               tinkerd install all
+          register: sync_remote_applets
+
+      rescue:
+        - debug:
+            var: ansible_failed_result
+        - fail:
+            msg: "Failed to deploy applet host"