Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2020-10-20 16:15:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.3486 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Tue Oct 20 16:15:51 2020 rev:17 rq:842591 version:0.5.2+git.1603119567.f2c4fc5
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2020-10-18 16:35:10.412858066 +0200
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.3486/sapnwbootstrap-formula.changes
2020-10-20 16:22:58.682366867 +0200
@@ -1,0 +2,13 @@
+Mon Oct 19 14:54:33 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Set the native fence mechanism usage for CSP as optional
+- Add instance name suffix to socat resources
+- Remove meta resource-stickness to the ERS resources group
+
+-------------------------------------------------------------------
+Thu Oct 15 07:21:21 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Update the db installation template to use correctly the schema
+ names for S/4HANA
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4.tar.gz
New:
----
sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.z8eJek/_old 2020-10-20 16:22:59.882367435 +0200
+++ /var/tmp/diff_new_pack.z8eJek/_new 2020-10-20 16:22:59.886367437 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.5.2+git.1602863532.8e1acf4
+Version: 0.5.2+git.1603119567.f2c4fc5
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.z8eJek/_old 2020-10-20 16:22:59.918367452 +0200
+++ /var/tmp/diff_new_pack.z8eJek/_new 2020-10-20 16:22:59.918367452 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
<param name="versionformat">0.5.2+git.%ct.%h</param>
- <param name="revision">8e1acf4ec789a4550cd13632db9fce39771fb1f9</param>
+ <param name="revision">f2c4fc5206cdc538a8200fa83ba4fecaf12bfca8</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4.tar.gz ->
sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/sapnwbootstrap-formula.changes
2020-10-16 17:52:12.000000000 +0200
+++
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/sapnwbootstrap-formula.changes
2020-10-19 16:59:27.000000000 +0200
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Oct 19 14:54:33 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Set the native fence mechanism usage for CSP as optional
+- Add instance name suffix to socat resources
+- Remove meta resource-stickness to the ERS resources group
+
+-------------------------------------------------------------------
+Thu Oct 15 07:21:21 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Update the db installation template to use correctly the schema
+ names for S/4HANA
+
+-------------------------------------------------------------------
Wed Oct 14 23:40:20 UTC 2020 - Simranpal Singh <[email protected]>
- Update the default 'nw_extract_dir' SWPM media extraction location
@@ -14,13 +27,13 @@
Thu Sep 24 12:43:47 UTC 2020 - Xabier Arbulu <[email protected]>
- Implement the differences between ENSA1 and ENSA2 versions
-- Add the keepalive configuration changes
+- Add the keepalive configuration changes
-------------------------------------------------------------------
Thu Aug 20 02:19:18 UTC 2020 - Simranpal Singh <[email protected]>
- Version 0.5.1
- * Add pillar.example to package
+ * Add pillar.example to package
(bsc#1174994, jsc#SLE-4047)
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/templates/cluster_resources.j2
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/templates/cluster_resources.j2
---
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/templates/cluster_resources.j2
2020-10-16 17:52:12.000000000 +0200
+++
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/templates/cluster_resources.j2
2020-10-19 16:59:27.000000000 +0200
@@ -13,6 +13,7 @@
{%- set ascs_virtual_host = data.ascs_virtual_host %}
{%- set ers_virtual_host = data.ers_virtual_host %}
{%- set monitoring_enabled = pillar.cluster.monitoring_enabled|default(False)
%}
+{%- set native_fencing = data.native_fencing|default(True) %}
{%- if data.ensa_version is defined %}
{%- set ensa_version = data.ensa_version|int %}
@@ -28,11 +29,6 @@
{%- if cloud_provider == "amazon-web-services" %}
-property cib-bootstrap-options: \
- stonith-enabled="true" \
- stonith-action="off" \
- stonith-timeout="600s"
-
rsc_defaults rsc-options: \
resource-stickiness=1 \
migration-threshold=3
@@ -41,12 +37,19 @@
timeout=600 \
record-pending=true
+{%- if native_fencing %}
+property cib-bootstrap-options: \
+ stonith-enabled="true" \
+ stonith-action="off" \
+ stonith-timeout="600s"
+
primitive res_aws_stonith_{{ sid }} stonith:external/ec2 \
params tag={{ data.instance_tag }} profile={{ data.cluster_profile}} \
op start interval=0 timeout=180 \
op stop interval=0 timeout=180 \
op monitor interval=120 timeout=60 \
meta target-role=Started
+{%- endif %}
primitive rsc_ip_{{ sid }}_ASCS{{ ascs_instance }} ocf:suse:aws-vpc-move-ip \
params ip={{ ascs_ip_address }} routing_table={{ data.route_table}} \
@@ -64,10 +67,12 @@
{%- elif cloud_provider == "google-cloud-platform" %}
+{%- if native_fencing %}
# This stonith resource will be duplicated for each node in the cluster
primitive rsc_gcp_stonith_{{ sid }}_{{ grains['host'] }} stonith:fence_gce \
params plug={{ grains['gcp_instance_name'] }} pcmk_host_map="{{
grains['host'] }}:{{ grains['gcp_instance_name'] }}" \
meta target-role=Started
+{%- endif %}
primitive rsc_ip_{{ sid }}_ASCS{{ ascs_instance }}
ocf:heartbeat:gcp-vpc-move-route \
params ip={{ data.ascs_ip_address }} vpc_network={{ data.vpc_network_name
}} route_name={{ data.ascs_route_name|default("nw-ascs-"~sid~"-route") }} \
@@ -85,11 +90,11 @@
{%- if cloud_provider == "microsoft-azure" %}
-primitive rsc_socat_{{ sid }}_ASCS azure-lb \
+primitive rsc_socat_{{ sid }}_ASCS{{ ascs_instance }} azure-lb \
params port=620{{ ascs_instance }} \
op monitor timeout=20s interval=10 depth=0
-primitive rsc_socat_{{ sid }}_ERS azure-lb \
+primitive rsc_socat_{{ sid }}_ERS{{ ers_instance }} azure-lb \
params port=621{{ ers_instance }} \
op monitor timeout=20s interval=10 depth=0
@@ -171,14 +176,13 @@
group grp_{{ sid }}_ERS{{ ers_instance }} \
rsc_ip_{{ sid }}_ERS{{ ers_instance }} \
rsc_fs_{{ sid }}_ERS{{ ers_instance }} \
- rsc_sap_{{ sid }}_ERS{{ ers_instance }} \
- {%- if cloud_provider == "microsoft-azure" %}
- rsc_socat_{{ sid }}_ERS \
+ rsc_sap_{{ sid }}_ERS{{ ers_instance }}
+ {%- if cloud_provider == "microsoft-azure" %} \
+ rsc_socat_{{ sid }}_ERS
{%- endif %}
- {%- if monitoring_enabled -%}
- rsc_exporter_{{ sid }}_ERS{{ ers_instance }} \
+ {%- if monitoring_enabled %} \
+ rsc_exporter_{{ sid }}_ERS{{ ers_instance }}
{%- endif %}
- meta resource-stickiness=3000
colocation col_sap_{{ sid }}_no_both -5000: grp_{{ sid }}_ERS{{ ers_instance
}} grp_{{ sid }}_ASCS{{ ascs_instance }}
{%- if ensa_version == 1 %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/templates/db.inifile.params.j2
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/templates/db.inifile.params.j2
---
old/sapnwbootstrap-formula-0.5.2+git.1602863532.8e1acf4/templates/db.inifile.params.j2
2020-10-16 17:52:12.000000000 +0200
+++
new/sapnwbootstrap-formula-0.5.2+git.1603119567.f2c4fc5/templates/db.inifile.params.j2
2020-10-19 16:59:27.000000000 +0200
@@ -17,7 +17,8 @@
# HDB_Schema_Check_Dialogs.dropSchema = false
# The name of the database schema.
-{% if schema_name == 'SAPABAP1' %}
+# For S/4HANA new versions (1809 and beyond), the DB is always named
`SAPHANADB`
+{% if schema_name in ['SAPABAP1', 'SAPHANADB'] %}
# HDB_Schema_Check_Dialogs.schemaName = {{ schema_name }}
{% else %}
HDB_Schema_Check_Dialogs.schemaName = {{ schema_name }}
