Merge pull request #50 from varkoly/SLE-15-SP4

Sle 15 sp4
yast · Jan 29, 2025 · e7f0b19 · e7f0b19
2 parents d92798f + 8689103
commit e7f0b19
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/package/yast2-sap-ha.changes b/package/yast2-sap-ha.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 29 10:54:19 UTC 2025 - Peter Varkoly <varkoly@suse.com>
+
+- #458 [doc] Issue in "Constraints for SAPHanaSR-angi"
+  https://github.com/SUSE/suse-best-practices/issues/458 
+- 4.4.10
+
 -------------------------------------------------------------------
 Mon Nov  4 21:34:50 UTC 2024 - Peter Varkoly <varkoly@suse.com>
 

diff --git a/package/yast2-sap-ha.spec b/package/yast2-sap-ha.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-sap-ha
-Version:        4.4.9
+Version:        4.4.10
 Release:        0
 BuildArch:      noarch
 Source0:        %{name}-%{version}.tar.bz2

diff --git a/src/data/sap_ha/SUDOERS_HANASR.angi.erb b/src/data/sap_ha/SUDOERS_HANASR.angi.erb
@@ -0,0 +1,3 @@
+# SAPHanaSR-ScaleUp entries for writing srHook cluster attribute
+<%= @system_id -%>adm ALL=(ALL) NOPASSWD: /usr/bin/SAPHanaSR-hookHelper --sid=<%= @system_id -%> *
+<%= @system_id -%>adm ALL=(ALL) NOPASSWD: /usr/sbin/crm_attribute -n hana_<%= @system_id -%>_site_srHook_*
diff --git a/src/data/sap_ha/SUDOERS_HANASR.erb → src/data/sap_ha/SUDOERS_HANASR.classic.erb b/src/data/sap_ha/SUDOERS_HANASR.erb → src/data/sap_ha/SUDOERS_HANASR.classic.erb
diff --git a/src/lib/sap_ha/configuration/hana.rb b/src/lib/sap_ha/configuration/hana.rb
@@ -341,7 +341,10 @@ def wait_idle(node)
       end
 
       def activating_msr
-        msr = "msl_SAPHana_#{@system_id}_HDB#{@instance}"
+        msr = "mst_SAPHanaCon_#{@system_id}_HDB#{@instance}"
+	if @rsa_version == "classic"
+          msr = "msl_SAPHana_#{@system_id}_HDB#{@instance}"
+	end
         out, status = exec_outerr_status("crm", "resource", "refresh", msr)
         @nlog.log_status(status.exitstatus == 0,
           "#{msr} status refresh OK",
@@ -403,8 +406,8 @@ def configure_firewall(role)
 
       # Creates the sudoers file
       def adapt_sudoers
-        if File.exist?(SapHA::Helpers.data_file_path("SUDOERS_HANASR.erb"))
-          Helpers.write_file("/etc/sudoers.d/saphanasr.conf", Helpers.render_template("SUDOERS_HANASR.erb", binding))
+        if File.exist?(SapHA::Helpers.data_file_path("SUDOERS_HANASR.#{@rsa_version}.erb"))
+          Helpers.write_file("/etc/sudoers.d/saphanasr.conf", Helpers.render_template("SUDOERS_HANASR.#{@rsa_version}.erb", binding))
         end
       end