diff --git a/SOURCES/bz1832358-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch b/SOURCES/bz1832358-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch new file mode 100644 index 0000000..377ea85 --- /dev/null +++ b/SOURCES/bz1832358-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch @@ -0,0 +1,38 @@ +From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Tue, 21 Apr 2020 14:11:36 +0200 +Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn + function + +--- + redhat/sap_cluster_connector | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/redhat/sap_cluster_connector b/redhat/sap_cluster_connector +index a88b27a..6250887 100755 +--- a/redhat/sap_cluster_connector ++++ b/redhat/sap_cluster_connector +@@ -401,7 +401,7 @@ sub list_sap_nodes { + chomp $crm_res_location_in; + #printf "DBG: where-result: %s\n", $crm_res_location_in; + my $current_node=""; +- if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+(\w+)\W*/ ) { ++ if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+([a-zA-Z0-9_-]+)/ ) { + #printf "DBG: where-result: match\n"; + $current_node = $2; + } +@@ -425,12 +425,12 @@ sub list_sap_nodes { + while () { + chomp; + # printf "%s\n", $_; +- if ( /^group_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) { ++ if ( /^group_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) { + # printf "DBG: group 1: %s, 2: %s, 3: %s\n", $1, $2, $3; + $resource{$1}->{nodes}->{$2}->{gc}=$3; + push(@{$resource{$1}->{priorities}->{$3}}, $2); + } +- if ( /^native_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) { ++ if ( /^native_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) { + # printf "DBG: native 1: %s, 2: %s, 3: %s\n", $1, $2, $3; + $resource{$1}->{nodes}->{$2}->{nc}=$3; + push(@{$resource{$1}->{priorities}->{$3}}, $2); diff --git a/SPECS/sap-cluster-connector.spec b/SPECS/sap-cluster-connector.spec index 4e6cc94..f2c24d4 100644 --- a/SPECS/sap-cluster-connector.spec +++ b/SPECS/sap-cluster-connector.spec @@ -25,7 +25,7 @@ Name: sap-cluster-connector Summary: SAP cluster connector script Version: 3.0.1 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 License: GPLv2+ URL: https://github.com/fdanapfel/sap_cluster_connector %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -34,6 +34,7 @@ Group: System Environment/Base Group: Productivity/Clustering/HA %endif Source0: %{sap_script_prefix}-%{sap_script_hash}.tar.gz +Patch0: bz1832358-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch BuildArch: noarch @@ -46,6 +47,7 @@ instances to be managed in a cluster environment. %prep %setup -q -n %{sap_script_prefix}-%{sap_script_hash} +%patch0 -p1 %build @@ -68,6 +70,11 @@ rm -rf %{buildroot} %{_datadir}/sap_cluster_connector %changelog +* Thu May 7 2020 Oyvind Albrigtsen - 3.0.1-4.1 +- sap-cluster-connector: allow dashes/underscores in nodenames + + Resolves: rhbz#1832358 + * Tue Jun 25 2019 Oyvind Albrigtsen - 3.0.1-4 - Initial build as separate package