Merge pull request #148 from yeoldegrove/gcp_fence_update

add location constraint to gcp_stonith
SUSE · Aug 16, 2022 · 5213c99 · 5213c99
2 parents 86828b9 + 8be3161
commit 5213c99
Show file tree

Hide file tree

Showing 3 changed files with 10 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.12.1+git.%ct.%h</param>
+    <param name="versionformat">0.13.0+git.%ct.%h</param>
     <param name="revision">%%VERSION%%</param>
   </service>
 

diff --git a/hana/templates/cluster_resources.j2 b/hana/templates/cluster_resources.j2
@@ -68,10 +68,11 @@ op_defaults \
       stonith-enabled="true" \
       stonith-timeout="150s"
 
-    # This stonith resource will be duplicated for each node in the cluster
+    # This stonith resource and location will be duplicated for each node in the cluster
     primitive rsc_gcp_stonith_{{ sid }}_HDB{{ instance }}_{{ grains['host'] }} stonith:fence_gce \
       params plug={{ grains['gcp_instance_name'] }} pcmk_host_map="{{ grains['host'] }}:{{ grains['gcp_instance_name'] }}" \
       meta target-role=Started
+    location loc_gcp_stonith_{{ sid }}_HDB{{ instance }}_{{ grains['host'] }} rsc_gcp_stonith_{{ sid }}_HDB{{ instance }}_{{ grains['host'] }} -inf: {{ grains['host'] }}
 
   {%- elif cloud_provider == "microsoft-azure" %}
     property $id="cib-bootstrap-options" \

diff --git a/saphanabootstrap-formula.changes b/saphanabootstrap-formula.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 15 08:29:52 UTC 2022 - Eike Waldt <[email protected]>
+
+- Version bump 0.13.0
+  * pass sid to sudoers in a SLES12 compatible way
+  * add location constraint to gcp_stonith
+
 -------------------------------------------------------------------
 Thu Aug 11 09:19:38 UTC 2022 - Christian Schneemann <[email protected]>