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-06-01 10:34:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Tue Jun 1 10:34:58 2021 rev:29 rq:895139 version:0.6.4+git.1621842068.a86c37c
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2021-05-21 21:50:39.854072388 +0200
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.1898/sapnwbootstrap-formula.changes
2021-06-01 10:35:19.260594366 +0200
@@ -5 +5,2 @@
- * Set default empty dictionary for virtual_addresses
+ * Set default empty dictionary for virtual_addresses and ensure
+ a dictionary is obtained if the value is None (hack for SUMA)
Old:
----
sapnwbootstrap-formula-0.6.4+git.1621602976.108e734.tar.gz
New:
----
sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.ZJ6KDc/_old 2021-06-01 10:35:20.156595891 +0200
+++ /var/tmp/diff_new_pack.ZJ6KDc/_new 2021-06-01 10:35:20.160595898 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.6.4+git.1621602976.108e734
+Version: 0.6.4+git.1621842068.a86c37c
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZJ6KDc/_old 2021-06-01 10:35:20.188595946 +0200
+++ /var/tmp/diff_new_pack.ZJ6KDc/_new 2021-06-01 10:35:20.192595952 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
<param name="versionformat">0.6.4+git.%ct.%h</param>
- <param name="revision">108e734cd09960b6cb7cfde94cbecb7350fa7eac</param>
+ <param name="revision">a86c37c898302fe14f9be7e6bd1404436dbe6721</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.6.4+git.1621602976.108e734.tar.gz ->
sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/netweaver/ha_cluster.sls
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/netweaver/ha_cluster.sls
---
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/netweaver/ha_cluster.sls
2021-05-21 15:16:16.000000000 +0200
+++
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/netweaver/ha_cluster.sls
2021-05-24 09:41:08.000000000 +0200
@@ -1,5 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
{% set host = grains['host'] %}
+# Hack to get empty dictionary on SUMA
+{%- set virtual_addresses = salt['pillar.get']('netweaver:virtual_addresses',
{}) or {} %}
{% for node in netweaver.nodes if netweaver.ha_enabled and host == node.host
and node.sap_instance in ['ascs', 'ers'] %}
@@ -10,7 +12,7 @@
{% set virtual_host_interface = node.virtual_host_interface|default('eth0') %}
{% set ifcfg_file = '/etc/sysconfig/network/ifcfg-'~virtual_host_interface %}
-{% for virtual_ip, hostname in netweaver.virtual_addresses.items() if hostname
== node.virtual_host %}
+{% for virtual_ip, hostname in virtual_addresses.items() if hostname ==
node.virtual_host %}
# Remove permanent ip address as the element is managed by the cluster
remove_permanent_ipaddr_{{ instance_name }}:
file.line:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/netweaver/setup/virtual_addresses.sls
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/netweaver/setup/virtual_addresses.sls
---
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/netweaver/setup/virtual_addresses.sls
2021-05-21 15:16:16.000000000 +0200
+++
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/netweaver/setup/virtual_addresses.sls
2021-05-24 09:41:08.000000000 +0200
@@ -1,7 +1,9 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
{%- set host = grains['host'] %}
+# Hack to get empty dictionary on SUMA
+{%- set virtual_addresses = salt['pillar.get']('netweaver:virtual_addresses',
{}) or {} %}
-{% for ip_address, hostname in netweaver.virtual_addresses.items() %}
+{% for ip_address, hostname in virtual_addresses.items() %}
{{ hostname }}:
host.present:
- ip: {{ ip_address }}
@@ -35,7 +37,7 @@
{% endif %}
{% set current_iddr = loop.index0+iddr_count %}
-{% for virtual_ip, hostname in netweaver.virtual_addresses.items() if hostname
== node.virtual_host %}
+{% for virtual_ip, hostname in virtual_addresses.items() if hostname ==
node.virtual_host %}
add_ipaddr_{{ virtual_host_interface }}_{{ instance_name }}:
file.append:
- name: {{ ifcfg_file }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.6.4+git.1621602976.108e734/sapnwbootstrap-formula.changes
2021-05-21 15:16:16.000000000 +0200
+++
new/sapnwbootstrap-formula-0.6.4+git.1621842068.a86c37c/sapnwbootstrap-formula.changes
2021-05-24 09:41:08.000000000 +0200
@@ -2,7 +2,8 @@
Fri May 21 12:59:37 UTC 2021 - Xabier Arbulu <[email protected]>
- Version bump 0.6.4
- * Set default empty dictionary for virtual_addresses
+ * Set default empty dictionary for virtual_addresses and ensure
+ a dictionary is obtained if the value is None (hack for SUMA)
(bsc#1185627)
-------------------------------------------------------------------
