diff --git a/ClusterLabs-resource-agents-e711383f.tar.gz b/ClusterLabs-resource-agents-e711383f.tar.gz deleted file mode 100644 index 1ae1b1196dc42904318f17ced2e77badd5e21205..0000000000000000000000000000000000000000 Binary files a/ClusterLabs-resource-agents-e711383f.tar.gz and /dev/null differ diff --git a/SAPHanaSR-ScaleOut-a77e8c6.tar.gz b/SAPHanaSR-ScaleOut-a77e8c6.tar.gz deleted file mode 100644 index 2c36bbc44d91fd5236456a9d9eb6b52fb02623de..0000000000000000000000000000000000000000 Binary files a/SAPHanaSR-ScaleOut-a77e8c6.tar.gz and /dev/null differ diff --git a/SAPHanaSR-d1dde99.tar.gz b/SAPHanaSR-d1dde99.tar.gz deleted file mode 100644 index 35cbd30f71ffeb653d8194d3a35c52e3acb364c9..0000000000000000000000000000000000000000 Binary files a/SAPHanaSR-d1dde99.tar.gz and /dev/null differ diff --git a/aliyun-cli-2.1.10.tar.gz b/aliyun-cli-2.1.10.tar.gz deleted file mode 100644 index 8d0ab62facaf9fbc12cdaca2f5d9c32199735704..0000000000000000000000000000000000000000 Binary files a/aliyun-cli-2.1.10.tar.gz and /dev/null differ diff --git a/aliyun-python-sdk-core-2.8.5.tar.gz b/aliyun-python-sdk-core-2.8.5.tar.gz deleted file mode 100644 index b43001bce92bff234cc0db876aed2792cc81cbd2..0000000000000000000000000000000000000000 Binary files a/aliyun-python-sdk-core-2.8.5.tar.gz and /dev/null differ diff --git a/aliyun-python-sdk-ecs-4.9.3.tar.gz b/aliyun-python-sdk-ecs-4.9.3.tar.gz deleted file mode 100644 index 99ec857e11015bcb6aecf68b74998f432041f88e..0000000000000000000000000000000000000000 Binary files a/aliyun-python-sdk-ecs-4.9.3.tar.gz and /dev/null differ diff --git a/aliyun-python-sdk-vpc-3.0.2.tar.gz b/aliyun-python-sdk-vpc-3.0.2.tar.gz deleted file mode 100644 index 5bb3958a01fcf8950125725e6b6e19192aa13ca0..0000000000000000000000000000000000000000 Binary files a/aliyun-python-sdk-vpc-3.0.2.tar.gz and /dev/null differ diff --git a/bz1940097-awsvip-dont-partially-match-IPs.patch b/bz1940097-awsvip-dont-partially-match-IPs.patch new file mode 100644 index 0000000000000000000000000000000000000000..1a0e86e6e3ea031bc6d0224463d762f9c0118111 --- /dev/null +++ b/bz1940097-awsvip-dont-partially-match-IPs.patch @@ -0,0 +1,23 @@ +From 3491a6ad30830a8545defa5a417a7db46b093904 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 17 Mar 2021 12:39:10 +0100 +Subject: [PATCH] awsvip: dont partially match similar IPs during + monitor-action + +--- + heartbeat/awsvip | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/awsvip b/heartbeat/awsvip +index 7d0bf35b6..044d049c6 100755 +--- a/heartbeat/awsvip ++++ b/heartbeat/awsvip +@@ -172,7 +172,7 @@ awsvip_monitor() { + --instance-id "${INSTANCE_ID}" \ + --query 'Reservations[].Instances[].NetworkInterfaces[].PrivateIpAddresses[].PrivateIpAddress[]' \ + --output text | \ +- grep -q "${SECONDARY_PRIVATE_IP}" ++ grep -qE "(^|\s)${SECONDARY_PRIVATE_IP}(\s|$)" + RET=$? + + if [ $RET -ne 0 ]; then diff --git a/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch b/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch new file mode 100644 index 0000000000000000000000000000000000000000..59fb0ef354d2f6208d3b4442278e847b9817197d --- /dev/null +++ b/bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch @@ -0,0 +1,23 @@ +From dd5394180267c652d0928db8c5508d9977893fe5 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 18 Mar 2021 16:23:10 +0100 +Subject: [PATCH] db2: add PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED status to + promote-check + +--- + heartbeat/db2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/db2 b/heartbeat/db2 +index a57fd2bb6..459136cbd 100755 +--- a/heartbeat/db2 ++++ b/heartbeat/db2 +@@ -767,7 +767,7 @@ db2_promote() { + return $OCF_SUCCESS + ;; + +- PRIMARY/PEER/*|PRIMARY/REMOTE_CATCHUP/*|Primary/Peer) ++ PRIMARY/PEER/*|PRIMARY/REMOTE_CATCHUP/*|PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED|Primary/Peer) + # nothing to do, only update pacemaker's view + echo MASTER > $STATE_FILE + return $OCF_SUCCESS diff --git a/colorama-0.3.3.tar.gz b/colorama-0.3.3.tar.gz deleted file mode 100644 index 69467f4e3ed33efcb3cbe77fd1cf03648803f319..0000000000000000000000000000000000000000 Binary files a/colorama-0.3.3.tar.gz and /dev/null differ diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..ad8eb77ba59be071474988a034571694eaa9db8e --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an7_9 diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..a60f8e02a8568c59a2ef054d9c917a2fb62e49c8 --- /dev/null +++ b/download @@ -0,0 +1,15 @@ +b20b3d724e37588bacf99ca528e79cd4 aliyun-cli-2.1.10.tar.gz +19ed27f972882c8469640ecbf050dcee aliyun-python-sdk-core-2.8.5.tar.gz +47b876cb4709ff8499f2dbe7a1ee814c aliyun-python-sdk-ecs-4.9.3.tar.gz +d4095b09cdcea73400fbc5f2e81c24f1 aliyun-python-sdk-vpc-3.0.2.tar.gz +05a2617ee9257d4ad62149d9dc823712 ClusterLabs-resource-agents-e711383f.tar.gz +395439c56c4a74878f3ecf4b331575e3 colorama-0.3.3.tar.gz +ce86d11789ed3be8d44e9f5b7d3e915a google-cloud-sdk-206.0.0-linux-x86_64.tar.gz +883f17828619757836ff510c42a7cca8 httplib2-0.18.1.tar.gz +14e037ac7b9a143e3074c991b1da047e jmespath-0.7.1.tar.gz +024b338d1df5d5c835f95d0d5569d40d pycryptodome-3.6.4.tar.gz +71d24ed8b8c710fb1067ac0fba4b08b4 pyroute2-0.4.13.tar.gz +c542e19aed29527101ca5445136fb2df sap_cluster_connector-0015fe2.tar.gz +f25c06d344effc33c9c91a95770cdf84 sap_cluster_connector-f3644f5.tar.gz +a92492ae1ee8f9451f17c6b02486a6e8 SAPHanaSR-d1dde99.tar.gz +5c6955625b90c261a738efc0749ae8d8 SAPHanaSR-ScaleOut-a77e8c6.tar.gz diff --git a/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz b/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz deleted file mode 100644 index 2d426d4454d9658bc6a04eed0553305208e6ea28..0000000000000000000000000000000000000000 Binary files a/google-cloud-sdk-206.0.0-linux-x86_64.tar.gz and /dev/null differ diff --git a/httplib2-0.18.1.tar.gz b/httplib2-0.18.1.tar.gz deleted file mode 100644 index 0506d415c4c7e3741a405e750acef51ab6d08ec6..0000000000000000000000000000000000000000 Binary files a/httplib2-0.18.1.tar.gz and /dev/null differ diff --git a/jmespath-0.7.1.tar.gz b/jmespath-0.7.1.tar.gz deleted file mode 100644 index 0eb58e204f12c25dcf311a72cfdacfcb7e6beec9..0000000000000000000000000000000000000000 Binary files a/jmespath-0.7.1.tar.gz and /dev/null differ diff --git a/pycryptodome-3.6.4.tar.gz b/pycryptodome-3.6.4.tar.gz deleted file mode 100644 index 47e5147bd5cf8fd9e4ac8903c1de27d0232b0098..0000000000000000000000000000000000000000 Binary files a/pycryptodome-3.6.4.tar.gz and /dev/null differ diff --git a/pyroute2-0.4.13.tar.gz b/pyroute2-0.4.13.tar.gz deleted file mode 100644 index 169bef6596c1ddd7c553eda8635e92b92df3a5dd..0000000000000000000000000000000000000000 Binary files a/pyroute2-0.4.13.tar.gz and /dev/null differ diff --git a/resource-agents.spec b/resource-agents.spec index 09165bb76390dfd7e9a15753296a2bbf6e9817a8..7ee50d90e3342e22799bacc8af6df810f5386691 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -99,7 +99,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.1.1 -Release: 61%{?dist}.15 +Release: 61%{?dist}.18 License: GPLv2+ and LGPLv2+ and ASL 2.0 URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -255,6 +255,8 @@ Patch129: bz1939282-aws-vpc-move-ip-add-ENI-lookup.patch Patch130: bz1935798-gcp-pd-move-fix-partially-matched-disk_name.patch Patch131: bz2042070-1-gcp-pd-move-gcp-vpc-move-route-dont-fail-1st-try.patch Patch132: bz2042070-2-gcp-vpc-move-vip-add-retries.patch +Patch133: bz1940097-awsvip-dont-partially-match-IPs.patch +Patch134: bz2127477-db2-add-PRIMARY-REMOTE_CATCHUP_PENDING-CONNECTED.patch # SAPHana* Patch500: bz1855888-SAPHana-use-actual-mode.patch @@ -452,7 +454,7 @@ SAP instances to be managed in a cluster environment. License: GPLv2+ Summary: SAP HANA Scale-Out cluster resource agents Version: 0.164.0 -Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.15 +Release: 6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.18 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} Group: System Environment/Base %else @@ -472,7 +474,7 @@ environment. License: GPLv2+ Summary: SAP cluster connector script Version: 3.0.1 -Release: 37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.15 +Release: 37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.18 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} Group: System Environment/Base %else @@ -629,6 +631,8 @@ exit 1 %patch130 -p1 %patch131 -p1 -F1 %patch132 -p1 +%patch133 -p1 +%patch134 -p1 # add SAPHana agents to Makefile.am mv %{saphana_prefix}-%{saphana_version}/ra/SAPHana* heartbeat @@ -1290,6 +1294,16 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Thu Oct 20 2022 Oyvind Albrigtsen - 4.1.1-61.18 +- db2: add PRIMARY/REMOTE_CATCHUP_PENDING/CONNECTED status to promote-check + + Resolves: rhbz#2127477 + +* Fri Oct 7 2022 Oyvind Albrigtsen - 4.1.1-61.17 +- awsvip: dont partially match similar IPs during monitor-action + + Resolves: rhbz#1940097 + * Tue Jan 25 2022 Oyvind Albrigtsen - 4.1.1-61.15 - gcp-pd-move/gcp-vpc-move-route/gcp-vpc-move-vip: dont fail with configuration rc when it might be a network hickup diff --git a/sap_cluster_connector-0015fe2.tar.gz b/sap_cluster_connector-0015fe2.tar.gz deleted file mode 100644 index d846818df5636c261c19e07dd5e8e83b82109ef0..0000000000000000000000000000000000000000 Binary files a/sap_cluster_connector-0015fe2.tar.gz and /dev/null differ diff --git a/sap_cluster_connector-f3644f5.tar.gz b/sap_cluster_connector-f3644f5.tar.gz deleted file mode 100644 index adde0d06646fc3358e9137f2d4d3ff7991399efc..0000000000000000000000000000000000000000 Binary files a/sap_cluster_connector-f3644f5.tar.gz and /dev/null differ