Merge pull request #49 from varkoly/SLE-15-SP5

yast-sap-ha does not support SAPHanaSR-angi
yast · Dec 4, 2024 · 6f2bbf2 · 6f2bbf2
2 parents e4ad9b0 + 60b5052
commit 6f2bbf2
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 166 deletions.
diff --git a/package/yast2-sap-ha.changes b/package/yast2-sap-ha.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov  4 21:34:50 UTC 2024 - Peter Varkoly <[email protected]>
+
+- yast-sap-ha does not support SAPHanaSR-angi (bsc#1232807)
+- Adapt to new SAPHanaSR-angi
+- 4.5.12
+
 -------------------------------------------------------------------
 Fri Mar 15 17:38:52 UTC 2024 - Peter Varkoly <[email protected]>
 

diff --git a/package/yast2-sap-ha.spec b/package/yast2-sap-ha.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-sap-ha
-Version:        4.5.11
+Version:        4.5.12
 Release:        0
 BuildArch:      noarch
 Source0:        %{name}-%{version}.tar.bz2
@@ -44,7 +44,6 @@ Requires:       openssh
 Requires:       HANA-Firewall >= 2.0.3
 %endif
 Requires:       util-linux
-Requires:       SAPHanaSR
 Requires:       kmod
 # for pidof
 Requires:       sysvinit-tools

diff --git a/src/clients/sap_ha.rb b/src/clients/sap_ha.rb
@@ -244,6 +244,10 @@ def main
       @sequence["product_check"][:hana] = "file_import_check" if @config.imported
       Wizard.CreateDialog
       Wizard.SetDialogTitle("HA Setup for SAP Products")
+      if not @config.hana.check_rsa_version
+        Popup.Error("There are no SUSE SAP Resource Agents installed.")
+	return
+      end
       begin
         if @config.unattended
           Sequencer.Run(@aliases, @unattended_sequence)

diff --git a/src/data/sap_ha/GLOBAL_INI_NON_PROD.erb b/src/data/sap_ha/GLOBAL_INI_NON_PROD.erb
diff --git a/src/data/sap_ha/GLOBAL_INI_SAPHANA_SR b/src/data/sap_ha/GLOBAL_INI_SAPHANA_SR
diff --git a/src/data/sap_ha/GLOBAL_INI_SUS_CHKSRV b/src/data/sap_ha/GLOBAL_INI_SUS_CHKSRV
diff --git a/src/data/sap_ha/GLOBAL_INI_SUS_COSTOPT.erb b/src/data/sap_ha/GLOBAL_INI_SUS_COSTOPT.erb
diff --git a/src/data/sap_ha/GLOBAL_INI_SUS_TKOVER b/src/data/sap_ha/GLOBAL_INI_SUS_TKOVER
diff --git a/src/data/sap_ha/tmpl_cluster_config.erb b/src/data/sap_ha/tmpl_cluster_config.erb