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-02-25 18:28:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
 and      /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sapnwbootstrap-formula"

Thu Feb 25 18:28:48 2021 rev:25 rq:874818 version:0.6.1+git.1614162749.57a2571

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
    2021-02-23 20:22:37.459773435 +0100
+++ 
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.2378/sapnwbootstrap-formula.changes
  2021-02-25 18:28:49.794234751 +0100
@@ -1,0 +2,6 @@
+Tue Feb 23 12:31:57 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Set the virtual ip addresses as permanent, except for HA scenarios,
+  to have them even after a reboot of the machine
+
+-------------------------------------------------------------------

Old:
----
  sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c.tar.gz

New:
----
  sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.apbHNY/_old  2021-02-25 18:28:50.634235297 +0100
+++ /var/tmp/diff_new_pack.apbHNY/_new  2021-02-25 18:28:50.634235297 +0100
@@ -19,7 +19,7 @@
 # See also http://en.opensuse.org/openSUSE:Specfile_guidelines
 
 Name:           sapnwbootstrap-formula
-Version:        0.6.1+git.1614002274.d59b08c
+Version:        0.6.1+git.1614162749.57a2571
 Release:        0
 Summary:        SAP Netweaver platform deployment formula
 License:        Apache-2.0

++++++ _service ++++++
--- /var/tmp/diff_new_pack.apbHNY/_old  2021-02-25 18:28:50.662235315 +0100
+++ /var/tmp/diff_new_pack.apbHNY/_new  2021-02-25 18:28:50.662235315 +0100
@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="filename">sapnwbootstrap-formula</param>
     <param name="versionformat">0.6.1+git.%ct.%h</param>
-    <param name="revision">d59b08cd987f92a29576c28c6e7f38f8e4a68026</param>
+    <param name="revision">57a2571e2bb78475bad3bbd1ebb91880ae7dd599</param>
   </service>
 
   <service name="recompress" mode="disabled">

++++++ sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c.tar.gz -> 
sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/netweaver/ha_cluster.sls
 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/netweaver/ha_cluster.sls
--- 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/netweaver/ha_cluster.sls
    2021-02-22 14:57:54.000000000 +0100
+++ 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/netweaver/ha_cluster.sls
    2021-02-24 11:32:29.000000000 +0100
@@ -7,6 +7,17 @@
 {% set instance_name = node.sid~'_'~instance %}
 {% set instance_folder = node.sap_instance.upper()~instance %}
 {% set profile_file = 
'/usr/sap/'~node.sid.upper()~'/SYS/profile/'~node.sid.upper()~'_'~instance_folder~'_'~node.virtual_host
 %}
+{% 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 %}
+# Remove permanent ip address as the element is managed by the cluster
+remove_permanent_ipaddr_{{ instance_name }}:
+  file.line:
+    - name: {{ ifcfg_file }}
+    - match: {{ virtual_ip }}
+    - mode: delete
+{% endfor %}
 
 install_suse_connector:
   pkg.installed:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/netweaver/setup/virtual_addresses.sls
 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/netweaver/setup/virtual_addresses.sls
--- 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/netweaver/setup/virtual_addresses.sls
       2021-02-22 14:57:54.000000000 +0100
+++ 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/netweaver/setup/virtual_addresses.sls
       2021-02-24 11:32:29.000000000 +0100
@@ -1,4 +1,5 @@
 {%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- set host = grains['host'] %}
 
 {% for ip_address, hostname in netweaver.virtual_addresses.items() %}
 {{ hostname }}:
@@ -7,3 +8,40 @@
     - names:
       - {{ hostname }}
 {% endfor %}
+
+
+{% for node in netweaver.nodes if node.host == host %}
+# Set the virtual ip addresses permanently
+{% set instance = '{:0>2}'.format(node.instance) %}
+{% set instance_name = node.sid~'_'~instance %}
+{% set virtual_host_interface = node.virtual_host_interface|default('eth0') %}
+{% set ifcfg_file = '/etc/sysconfig/network/ifcfg-'~virtual_host_interface %}
+{% set iddr_count = salt['cmd.run']('cat '~ifcfg_file~' | grep -c ^IPADDR || 
true', python_shell=true)|int %}
+
+{% if loop.first %}
+add_start_mode_{{ virtual_host_interface }}:
+  file.append:
+    - name: {{ ifcfg_file }}
+    - text: STARTMODE=onboot
+    - unless:
+      - cat {{ ifcfg_file }} | grep '^STARTMODE='
+
+add_boot_proto_{{ virtual_host_interface }}:
+  file.append:
+    - name: {{ ifcfg_file }}
+    - text: BOOTPROTO=static
+    - unless:
+      - cat {{ ifcfg_file }} | grep '^BOOTPROTO='
+{% endif %}
+
+{% set current_iddr = loop.index0+iddr_count %}
+{% for virtual_ip, hostname in netweaver.virtual_addresses.items() if hostname 
== node.virtual_host %}
+add_ipaddr_{{ virtual_host_interface }}_{{ instance_name }}:
+  file.append:
+    - name: {{ ifcfg_file }}
+    - text: IPADDR_{{ current_iddr }}={{ virtual_ip }}/{{ 
node.virtual_host_mask|default(24) }}
+    - unless:
+      - cat {{ ifcfg_file }} | grep '{{ virtual_ip }}'
+{% endfor %}
+
+{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/sapnwbootstrap-formula.changes
 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/sapnwbootstrap-formula.changes
--- 
old/sapnwbootstrap-formula-0.6.1+git.1614002274.d59b08c/sapnwbootstrap-formula.changes
      2021-02-22 14:57:54.000000000 +0100
+++ 
new/sapnwbootstrap-formula-0.6.1+git.1614162749.57a2571/sapnwbootstrap-formula.changes
      2021-02-24 11:32:29.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Feb 23 12:31:57 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Set the virtual ip addresses as permanent, except for HA scenarios,
+  to have them even after a reboot of the machine
+
+-------------------------------------------------------------------
 Fri Feb 19 08:48:58 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
 
 - Add some mandatory values in the DB and PAS templates for S4HANA

Reply via email to