Skip to content

Commit 5fe67c9

Browse files
varkolyvarkoly
authored
Merge pull request #46 from varkoly/master
yast-sap-ha does not support SAPHanaSR-angi
2 parents d28e084 + 1d643ce commit 5fe67c9

17 files changed

+366
-35
lines changed

‎.rubocop.yml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
################################################################################
2+
#
3+
# This part contains the shared Rubocop configuration for SUSE projects. It is
4+
# maintained at https://github.com/SUSE/style-guides/blob/master/rubocop-suse.yml
5+
#
6+
# NOTE: some rules have been commented out, see the YaST specific changes
7+
# at the end of the file!
8+
#
9+
################################################################################
10+
11+
# Disabled, would require too many changes in the current code
12+
#Lint/EndAlignment:
13+
# StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#lintendalignment
14+
# AlignWith: variable
15+
16+
Metrics/LineLength:
17+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#metricslinelength
18+
Max: 110
19+
# To make it possible to copy or click on URIs in the code, we allow lines
20+
# contaning a URI to be longer than Max.
21+
AllowURI: true
22+
URISchemes:
23+
- http
24+
- https
25+
26+
Style/AlignHash:
27+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignhash
28+
EnforcedHashRocketStyle: table
29+
EnforcedColonStyle: table
30+
31+
# Disabled, see the YaST default at the end of the file
32+
#Style/AlignParameters:
33+
# StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylealignparameters
34+
# Enabled: false
35+
36+
Style/CollectionMethods:
37+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylecollectionmethods
38+
Enabled: false
39+
40+
Style/EmptyLinesAroundBlockBody:
41+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#styleemptylinesaroundblockbody
42+
Enabled: false
43+
44+
Style/MultilineOperationIndentation:
45+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylemultilineoperationindentation
46+
EnforcedStyle: indented
47+
48+
Style/StringLiterals:
49+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliterals
50+
EnforcedStyle: double_quotes
51+
Enabled: false
52+
53+
Style/StringLiteralsInInterpolation:
54+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#stylestringliteralsininterpolation
55+
EnforcedStyle: double_quotes
56+
57+
Style/WordArray:
58+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-the-upstream-style-guide
59+
Enabled: false
60+
61+
Style/RegexpLiteral:
62+
StyleGuide: https://github.com/SUSE/style-guides/blob/master/Ruby.md#deviations-from-the-upstream-style-guide
63+
Enabled: false
64+
65+
Style/SignalException:
66+
StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
67+
EnforcedStyle: only_raise
68+
69+
70+
################################################################################
71+
#
72+
# This part contains the YaST specific changes to the shared SUSE configuration
73+
#
74+
################################################################################
75+
76+
# no extra indentation for multiline function calls
77+
Style/AlignParameters:
78+
EnforcedStyle: with_fixed_indentation
79+
80+
# no extra indentation for case
81+
Style/CaseIndentation:
82+
IndentWhenRelativeTo: end
83+
84+
# "unless" has a different connotation than "if not"
85+
Style/NegatedIf:
86+
Enabled: false
87+
88+
89+
################################################################################
90+
#
91+
# Settings specific to the yast-hana-update module
92+
#
93+
################################################################################
94+
95+
# Edited for yast-hana-update
96+
Metrics/MethodLength:
97+
Max: 60
98+
99+
# Edited for yast-hana-update
100+
Metrics/ClassLength:
101+
Max: 400
102+
103+
Metrics/CyclomaticComplexity:
104+
Enabled: false
105+
106+
Metrics/PerceivedComplexity:
107+
Enabled: false
108+
109+
Metrics/AbcSize:
110+
Enabled: false

‎package/yast2-sap-ha.changes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-------------------------------------------------------------------
2+
Mon Nov 4 21:34:50 UTC 2024 - Peter Varkoly <varkoly@suse.com>
3+
4+
- yast-sap-ha does not support SAPHanaSR-angi (bsc#1232807)
5+
Adapt to new SAPHanaSR-angi
6+
- 6.0.2
7+
18
-------------------------------------------------------------------
29
Fri Mar 15 17:38:52 UTC 2024 - Peter Varkoly <varkoly@suse.com>
310

‎package/yast2-sap-ha.spec‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
Name: yast2-sap-ha
20-
Version: 6.0.1
20+
Version: 6.0.2
2121
Release: 0
2222
BuildArch: noarch
2323
Source0: %{name}-%{version}.tar.bz2
@@ -45,7 +45,6 @@ Requires: openssh
4545
Requires: HANA-Firewall >= 2.0.3
4646
%endif
4747
Requires: util-linux
48-
Requires: SAPHanaSR
4948
Requires: kmod
5049
# for pidof
5150
Requires: sysvinit-tools

‎src/clients/sap_ha.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ def main
244244
@sequence["product_check"][:hana] = "file_import_check" if @config.imported
245245
Wizard.CreateDialog
246246
Wizard.SetDialogTitle("HA Setup for SAP Products")
247+
if not @config.hana.check_rsa_version
248+
Popup.Error("There are no SUSE SAP Resource Agents installed.")
249+
return
250+
end
247251
begin
248252
if @config.unattended
249253
Sequencer.Run(@aliases, @unattended_sequence)

src/data/sap_ha/GLOBAL_INI_NON_PROD.erb renamed to src/data/sap_ha/GLOBAL_INI_NON_PROD.angi.erb

File renamed without changes.

‎src/data/sap_ha/GLOBAL_INI_NON_PROD.classic.erb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[memorymanager]
2+
global_allocation_limit = <%= @production_constraints[:global_alloc_limit_non] -%>

‎src/data/sap_ha/GLOBAL_INI_SAPHANA_SR.angi‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[ha_dr_provider_susHanaSR]
2+
provider = susHanaSR
3+
path = /usr/share/SAPHanaSR-angi
4+
execution_order = 1
5+
6+
[trace]
7+
ha_dr_sushanasr = info

src/data/sap_ha/GLOBAL_INI_SAPHANA_SR renamed to src/data/sap_ha/GLOBAL_INI_SAPHANA_SR.classic

File renamed without changes.

‎src/data/sap_ha/GLOBAL_INI_SUS_CHKSRV.angi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[ha_dr_provider_suschksrv]
2+
provider = susChkSrv
3+
path = /usr/share/SAPHanaSR-angi/
4+
execution_order = 3
5+
action_on_lost=stop
6+
7+
[trace]
8+
ha_dr_suschksrv = info

src/data/sap_ha/GLOBAL_INI_SUS_CHKSRV renamed to src/data/sap_ha/GLOBAL_INI_SUS_CHKSRV.classic

File renamed without changes.

0 commit comments

Comments
 (0)