Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2021-07-10 00:00:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Sat Jul 10 00:00:26 2021 rev:31 rq:905222 version:0.6.6+git.1625824616.eb6e12c
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2021-07-02 13:29:07.503988735 +0200
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.2625/sapnwbootstrap-formula.changes
2021-07-10 00:03:17.122683345 +0200
@@ -1,0 +2,6 @@
+Thu Jul 7 13:32:06 UTC 2021 - Eike Waldt <[email protected]>
+
+- Version bump 0.6.6
+ * fix sap_host_exporter to run on both HA nodes
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df.tar.gz
New:
----
sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.mCXpB7/_old 2021-07-10 00:03:17.506680358 +0200
+++ /var/tmp/diff_new_pack.mCXpB7/_new 2021-07-10 00:03:17.510680327 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.6.5+git.1625210905.7b947df
+Version: 0.6.6+git.1625824616.eb6e12c
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.mCXpB7/_old 2021-07-10 00:03:17.538680110 +0200
+++ /var/tmp/diff_new_pack.mCXpB7/_new 2021-07-10 00:03:17.538680110 +0200
@@ -4,8 +4,8 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
- <param name="versionformat">0.6.5+git.%ct.%h</param>
- <param name="revision">7b947dff5f5d6268caf7eb28b2e70f0e14c2e3e3</param>
+ <param name="versionformat">0.6.6+git.%ct.%h</param>
+ <param name="revision">eb6e12c9c1107b0fc222cd9584303283d8b20345</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df.tar.gz ->
sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/_service
new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/_service
--- old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/_service
2021-07-02 09:28:25.000000000 +0200
+++ new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/_service
2021-07-09 11:56:56.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
- <param name="versionformat">0.6.5+git.%ct.%h</param>
+ <param name="versionformat">0.6.6+git.%ct.%h</param>
<param name="revision">%%VERSION%%</param>
</service>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/netweaver/monitoring.sls
new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/netweaver/monitoring.sls
---
old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/netweaver/monitoring.sls
2021-07-02 09:28:25.000000000 +0200
+++
new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/netweaver/monitoring.sls
2021-07-09 11:56:56.000000000 +0200
@@ -6,10 +6,27 @@
- name: prometheus-sap_host_exporter
# the sid, instance number pair of a node is unique, so we need to adapt
configuration
-{% for node in netweaver.nodes if host == node.host and node.sap_instance !=
"db" %}
+{% for node in netweaver.nodes %}
+
+# test if running on HA ASCS+ERS
+{% if netweaver.ha_enabled and node.sap_instance in ["ascs", "ers"] %}
+{% set on_ha_cs = True %}
+# do not enable ASCS and ERS exporter service in HA use case (handled by
pacemaker)
+{% set service_status = "disabled" %}
+{% set service_enabled = False %}
+{% else %}
+{% set on_ha_cs = False %}
+{% set service_status = "running" %}
+{% set service_enabled = True %}
+{% endif %}
+
+# in non-HA use case create ASCS|ERS|PAS|AAS configuration
+# in HA use case create additional ASCS|ERS configuration on ERS|ASCS
+{% if (host == node.host or on_ha_cs) and node.sap_instance != "db" %}
+
{% set sap_instance_nr = '{:0>2}'.format(node.instance) %}
-{% set exporter_instance = '{}_{}{}'.format(node.sid,
node.sap_instance.upper(), sap_instance_nr) %}
-{% set instance_name = node.sid~'_'~sap_instance_nr %}
+{% set exporter_instance = '{}_{}{}'.format(node.sid.upper(),
node.sap_instance.upper(), sap_instance_nr) %}
+{% set instance_name = node.sid.upper()~'_'~sap_instance_nr %}
# we bind each exporter instance to a SAP instance virtual host
sap_host_exporter_configuration_{{ exporter_instance }}:
@@ -20,17 +37,30 @@
sap-control-uds: /tmp/.sapstream5{{ sap_instance_nr }}13
- require:
- pkg: prometheus_sap_host_exporter_pkg
- - netweaver_install_{{ instance_name }}
+# on HA use case deploy ASCS|ERS on ERS|ASCS
+{% if on_ha_cs %}
+ - onlyif:
+ - test -d /usr/sap/{{ node.sid.upper() }}/ASCS* || test -d /usr/sap/{{
node.sid.upper() }}/ERS*
+{% endif %}
+
sap_host_exporter_service_{{ exporter_instance }}:
- service.running:
+ service.{{ service_status }}:
- name: prometheus-sap_host_exporter@{{ exporter_instance }}
- - enable: {{ not netweaver.ha_enabled }}
+ - enable: {{ service_enabled }}
- restart: True
- require:
- pkg: prometheus_sap_host_exporter_pkg
- file: sap_host_exporter_configuration_{{ exporter_instance }}
+# on HA use case deploy ASCS|ERS on ERS|ASCS
+{% if on_ha_cs %}
+ - onlyif:
+ - test -d /usr/sap/{{ node.sid.upper() }}/ASCS* || test -d /usr/sap/{{
node.sid.upper() }}/ERS*
+# on non-HA use case watch file for changes (not possible for disabled service)
+{% else %}
- watch:
- file: sap_host_exporter_configuration_{{ exporter_instance }}
+{% endif %}
+{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.6.5+git.1625210905.7b947df/sapnwbootstrap-formula.changes
2021-07-02 09:28:25.000000000 +0200
+++
new/sapnwbootstrap-formula-0.6.6+git.1625824616.eb6e12c/sapnwbootstrap-formula.changes
2021-07-09 11:56:56.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Jul 7 13:32:06 UTC 2021 - Eike Waldt <[email protected]>
+
+- Version bump 0.6.6
+ * fix sap_host_exporter to run on both HA nodes
+
+-------------------------------------------------------------------
Thu Jun 17 13:56:06 UTC 2021 - Eike Waldt <[email protected]>
- Version bump 0.6.5
