Merge pull request #140 from yeoldegrove/fix_mm

fix majority maker test condition if grain is empty
SUSE · May 23, 2022 · a368b7f · a368b7f
2 parents 5b1bef6 + 4016da7
commit a368b7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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.9.0+git.%ct.%h</param>
+    <param name="versionformat">0.9.1+git.%ct.%h</param>
     <param name="revision">%%VERSION%%</param>
   </service>
 

diff --git a/saphanabootstrap-formula.changes b/saphanabootstrap-formula.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 05 20:18:52 UTC 2022 - Eike Waldt <[email protected]>
+
+- Version bump 0.9.1
+  * fix majority_maker code on case grain is empty
+
 -------------------------------------------------------------------
 Thu Nov 17 13:52:34 UTC 2021 - Eike Waldt <[email protected]>
 

diff --git a/templates/cluster_resources.j2 b/templates/cluster_resources.j2
@@ -273,10 +273,10 @@ colocation col_exporter_{{ sid }}_HDB{{ instance }} -inf: rsc_exporter_{{ sid }}
 
 {%- endif %}
 
+{%- if majority_maker != "" and majority_maker != "None" %}
 ######################################
 # majority maker
 ######################################
-{%- if majority_maker != "" %}
 location {{ SAPHanaResource }}_{{ sid }}_HDB{{ instance }}_not_on_majority_maker msl_{{ SAPHanaResource }}_{{ sid }}_HDB{{ instance }} -inf: {{ majority_maker }}
 location SAPHanaTopology_{{ sid }}_HDB{{ instance }}_not_on_majority_maker cln_SAPHanaTopology_{{ sid }}_HDB{{ instance }} -inf: {{ majority_maker }}
 {%- if monitoring_enabled %}