Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package drbd-formula for openSUSE:Factory checked in at 2021-07-02 13:28:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-formula (Old) and /work/SRC/openSUSE:Factory/.drbd-formula.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-formula" Fri Jul 2 13:28:00 2021 rev:12 rq:903628 version:0.4.4+git.1625210904.93ea1f9 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-formula/drbd-formula.changes 2021-05-20 19:25:49.081756040 +0200 +++ /work/SRC/openSUSE:Factory/.drbd-formula.new.2625/drbd-formula.changes 2021-07-02 13:29:06.147999256 +0200 @@ -1,0 +2,6 @@ +Thu Jun 17 13:56:06 UTC 2021 - Eike Waldt <[email protected]> + +- Version bump 0.4.4 + * add native fencing for microsoft-azure + +------------------------------------------------------------------- Old: ---- drbd-formula-0.4.3+git.1621498620.45e1839.tar.gz New: ---- drbd-formula-0.4.4+git.1625210904.93ea1f9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-formula.spec ++++++ --- /var/tmp/diff_new_pack.weF43r/_old 2021-07-02 13:29:06.587995843 +0200 +++ /var/tmp/diff_new_pack.weF43r/_new 2021-07-02 13:29:06.591995811 +0200 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas # See also https://en.opensuse.org/openSUSE:Specfile_guidelines Name: drbd-formula -Version: 0.4.3+git.1621498620.45e1839 +Version: 0.4.4+git.1625210904.93ea1f9 Release: 0 Summary: DRBD deployment salt formula License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.weF43r/_old 2021-07-02 13:29:06.619995594 +0200 +++ /var/tmp/diff_new_pack.weF43r/_new 2021-07-02 13:29:06.623995563 +0200 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">drbd-formula</param> - <param name="versionformat">0.4.3+git.%ct.%h</param> - <param name="revision">45e183981c2a7c8c2291eab707c35c0e123a1ac2</param> + <param name="versionformat">0.4.4+git.%ct.%h</param> + <param name="revision">93ea1f91664cebcd62e2d83db87ad575ca3bc75e</param> </service> <service name="recompress" mode="disabled"> ++++++ drbd-formula-0.4.3+git.1621498620.45e1839.tar.gz -> drbd-formula-0.4.4+git.1625210904.93ea1f9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.3+git.1621498620.45e1839/_service new/drbd-formula-0.4.4+git.1625210904.93ea1f9/_service --- old/drbd-formula-0.4.3+git.1621498620.45e1839/_service 2021-05-20 10:17:00.000000000 +0200 +++ new/drbd-formula-0.4.4+git.1625210904.93ea1f9/_service 2021-07-02 09:28:24.000000000 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">drbd-formula</param> - <param name="versionformat">0.4.3+git.%ct.%h</param> + <param name="versionformat">0.4.4+git.%ct.%h</param> <param name="revision">%%VERSION%%</param> </service> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.3+git.1621498620.45e1839/drbd-formula.changes new/drbd-formula-0.4.4+git.1625210904.93ea1f9/drbd-formula.changes --- old/drbd-formula-0.4.3+git.1621498620.45e1839/drbd-formula.changes 2021-05-20 10:17:00.000000000 +0200 +++ new/drbd-formula-0.4.4+git.1625210904.93ea1f9/drbd-formula.changes 2021-07-02 09:28:24.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 17 13:56:06 UTC 2021 - Eike Waldt <[email protected]> + +- Version bump 0.4.4 + * add native fencing for microsoft-azure + +------------------------------------------------------------------- Mon May 17 05:43:52 UTC 2021 - nick wang <[email protected]> - Version bump 0.4.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drbd-formula-0.4.3+git.1621498620.45e1839/templates/habootstrap-formula/cluster_resources_nfs_cloud.j2 new/drbd-formula-0.4.4+git.1625210904.93ea1f9/templates/habootstrap-formula/cluster_resources_nfs_cloud.j2 --- old/drbd-formula-0.4.3+git.1621498620.45e1839/templates/habootstrap-formula/cluster_resources_nfs_cloud.j2 2021-05-20 10:17:00.000000000 +0200 +++ new/drbd-formula-0.4.4+git.1625210904.93ea1f9/templates/habootstrap-formula/cluster_resources_nfs_cloud.j2 2021-07-02 09:28:24.000000000 +0200 @@ -2,7 +2,16 @@ {%- set cloud_provider = grains['cloud_provider'] %} {%- set drbd = salt['pillar.get']('drbd', default={}, merge=True) %} {%- set nfsid = 1 %} + +{%- if cloud_provider == "amazon-web-services" %} +{%- set native_fencing = data.native_fencing|default(True) %} +{%- elif cloud_provider == "google-cloud-platform" %} {%- set native_fencing = data.native_fencing|default(True) %} +{%- elif cloud_provider == "microsoft-azure" %} +{%- set native_fencing = data.native_fencing|default(False) %} +{%- else %}{# all other cases like openstack and libvirt #} +{%- set native_fencing = data.native_fencing|default(False) %} +{%- endif %} # # defaults and production DRBD @@ -47,6 +56,16 @@ op monitor interval=10 timeout=20 {%- if cloud_provider == "microsoft-azure" %} +{%- if native_fencing %} +property $id="cib-bootstrap-options" \ + stonith-enabled="true" \ + concurrent-fencing=true + +primitive rsc_azure_stonith_{{ res.name }}_nfs stonith:fence_azure_arm \ + params subscriptionId={{ data.azure_subscription_id }} resourceGroup={{ data.azure_resource_group_name }} tenantId={{ data.azure_tenant_id }} login={{ data.azure_fence_agent_app_id }} passwd="{{ data.azure_fence_agent_client_secret }}" pcmk_monitor_retries=4 pcmk_action_limit=3 power_timeout=240 pcmk_reboot_timeout=900 \ + op monitor interval=3600 timeout=120 \ + meta target-role=Started +{%- endif %} primitive rsc_socat_{{ res.name }}_nfs azure-lb \ params port={{ data.probe }} \ op monitor timeout=20s interval=10 depth=0
