From 98d0a61ceade612a2b175c89cf7b8845aaa6b713 Mon Sep 17 00:00:00 2001
From: Harm Jan Stam <harmjan+git@harmjan.com>
Date: Tue, 19 Dec 2023 20:20:29 +0100
Subject: [PATCH] Revert "Import KV secrets in SCS HA Installation Playbook
 (#518)" (#519)

This reverts commit 3f54e88e30d3e62312b3f703a63f71ea0ae94956.
---
 .../playbook_05_00_00_sap_scs_install.yaml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/ansible/playbook_05_00_00_sap_scs_install.yaml b/deploy/ansible/playbook_05_00_00_sap_scs_install.yaml
index c3f67527b9..37f275a4bb 100644
--- a/deploy/ansible/playbook_05_00_00_sap_scs_install.yaml
+++ b/deploy/ansible/playbook_05_00_00_sap_scs_install.yaml
@@ -70,6 +70,15 @@
                                             - scs_high_availability or database_high_availability
       tags:
                                             - 0.2-wincluster-witness
+# MKD - These two tasks (Above & Below) seem to achieve the same thing?
+    - name:                                 "SCS Installation Playbook: - Read/Create key vault secrets"
+      ansible.builtin.include_role:
+        name:                               roles-misc/0.2-kv-secrets
+        public:                             true
+      vars:
+        operation:                          fencing
+      tags:
+                                            - kv-secrets
 
     - name:                            "SCS Installation Playbook: - Read storage account details"
       ansible.builtin.include_role:
@@ -434,15 +443,6 @@
           tags:
                                                 - always
 
-        - name:                                 "SCS HA Installation Playbook: - Read/Create key vault secrets"
-          ansible.builtin.include_role:
-            name:                               roles-misc/0.2-kv-secrets
-            public:                             true
-          vars:
-            operation:                          fencing
-          tags:
-                                                - kv-secrets
-
         - name:                                 "SCS HA Installation Playbook: - Initialize facts... Fencing"
           ansible.builtin.set_fact:
             fencing_spn_client_id:              "{% if not use_msi_for_clusters %}{{ hostvars.localhost.sap_fencing_spn_client_id }}{% endif %}"