From 25b031d60d9a76b68c568e5a5585c4a18af25985 Mon Sep 17 00:00:00 2001
From: Eike Waldt <waldt@b1-systems.de>
Date: Fri, 3 Jun 2022 18:21:59 +0200
Subject: [PATCH 1/3] fix hook removal conditions

---
 hana/ha_cluster.sls | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hana/ha_cluster.sls b/hana/ha_cluster.sls
index 43a779f..4c47731 100644
--- a/hana/ha_cluster.sls
+++ b/hana/ha_cluster.sls
@@ -125,9 +125,8 @@ remove_wrong_ha_hook_{{ sap_instance }}_sections_multi_target:
         ha_dr_provider_SAPHanaSR:
     - require:
       - pkg: install_SAPHanaSR
-    - unless:
-      - fun: file.file_exists
-        path: sr_hook_multi_target
+    - onlyif:
+      - test -f {{ sr_hook_multi_target }}
 
 remove_wrong_ha_hook_{{ sap_instance }}_options_multi_target:
   ini.options_absent:
@@ -161,9 +160,8 @@ remove_wrong_ha_hook_{{ sap_instance }}_options:
           - ha_dr_saphanasrmultitarget
     - require:
       - pkg: install_SAPHanaSR
-    - onlyif:
-      - fun: file.file_exists
-        path: sr_hook_multi_target
+    - unless:
+      - test -f {{ sr_hook_multi_target }}
 
 # Configure system replication operation mode in the primary site
 {% for secondary_node in hana.nodes if node.primary is defined and secondary_node.secondary is defined and secondary_node.secondary.remote_host == host %}

From 543ed4fd3ed3584047ee42d1763e02d4e70ea924 Mon Sep 17 00:00:00 2001
From: Eike Waldt <waldt@b1-systems.de>
Date: Fri, 3 Jun 2022 18:30:30 +0200
Subject: [PATCH 2/3] fix majority_maker code on case grain is empty

---
 templates/cluster_resources.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cluster_resources.j2 b/templates/cluster_resources.j2
index dd0fcba..316e337 100644
--- a/templates/cluster_resources.j2
+++ b/templates/cluster_resources.j2
@@ -273,7 +273,7 @@ colocation col_exporter_{{ sid }}_HDB{{ instance }} -inf: rsc_exporter_{{ sid }}
 
 {%- endif %}
 
-{%- if majority_maker != "" and majority_maker != "None" %}
+{%- if majority_maker != "" and majority_maker != None and majority_maker != "None" %}
 ######################################
 # majority maker
 ######################################

From 729f64b31dc7ae0ea11c7175fd18537fccbb1258 Mon Sep 17 00:00:00 2001
From: Eike Waldt <waldt@b1-systems.de>
Date: Fri, 3 Jun 2022 18:32:43 +0200
Subject: [PATCH 3/3] bump version to 0.10.1

---
 _service                         | 2 +-
 saphanabootstrap-formula.changes | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/_service b/_service
index 8b31d7b..93cb6a8 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="filename">saphanabootstrap-formula</param>
-    <param name="versionformat">0.10.0+git.%ct.%h</param>
+    <param name="versionformat">0.10.1+git.%ct.%h</param>
     <param name="revision">%%VERSION%%</param>
   </service>
 
diff --git a/saphanabootstrap-formula.changes b/saphanabootstrap-formula.changes
index b43a856..ca92dfc 100644
--- a/saphanabootstrap-formula.changes
+++ b/saphanabootstrap-formula.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 06 18:31:32 UTC 2022 - Eike Waldt <waldt@b1-systems.de>
+
+- Version bump 0.10.1
+  * fix hook removal conditions
+  * fix majority_maker code on case grain is empty
+
 -------------------------------------------------------------------
 Thu May 13 08:16:24 UTC 2022 - Eike Waldt <waldt@b1-systems.de>