Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2021-03-18 22:55:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Thu Mar 18 22:55:07 2021 rev:31 rq:879823 version:0.7.0+git.1616053711.09a6ec3
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2021-03-16 15:46:21.725224766 +0100
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.2401/saphanabootstrap-formula.changes
2021-03-18 22:55:09.939545428 +0100
@@ -1,0 +2,6 @@
+Thu Mar 18 07:41:18 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Implement the load balancer use case in the cluster resource
+ agents template
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96.tar.gz
New:
----
saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.K5M7Hw/_old 2021-03-18 22:55:10.419545946 +0100
+++ /var/tmp/diff_new_pack.K5M7Hw/_new 2021-03-18 22:55:10.423545951 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.7.0+git.1615795713.39bbb96
+Version: 0.7.0+git.1616053711.09a6ec3
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.K5M7Hw/_old 2021-03-18 22:55:10.447545976 +0100
+++ /var/tmp/diff_new_pack.K5M7Hw/_new 2021-03-18 22:55:10.451545981 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">saphanabootstrap-formula</param>
<param name="versionformat">0.7.0+git.%ct.%h</param>
- <param name="revision">39bbb9688c307710f2529d3780415bd064a5fdaf</param>
+ <param name="revision">09a6ec3dfbc2bd72fcebb7053e6556d9e7fc30c8</param>
</service>
<service name="recompress" mode="disabled">
++++++ saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96.tar.gz ->
saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3/saphanabootstrap-formula.changes
---
old/saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96/saphanabootstrap-formula.changes
2021-03-15 09:08:33.000000000 +0100
+++
new/saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3/saphanabootstrap-formula.changes
2021-03-18 08:48:31.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Mar 18 07:41:18 UTC 2021 - Xabier Arbulu <[email protected]>
+
+- Implement the load balancer use case in the cluster resource
+ agents template
+
+-------------------------------------------------------------------
Fri Mar 12 15:39:31 UTC 2021 - Xabier Arbulu <[email protected]>
- Fix the HANA sidadm usage to tranfsorm to lowercase some states
@@ -9,7 +15,7 @@
- Fix how the HANA client options are handled. Now, if any of the
HANA client option variables are set, they will have preference
- over the database option (the platform and extracted options)
+ over the database option (the platform and extracted options)
-------------------------------------------------------------------
Tue Jan 19 13:35:18 UTC 2021 - Xabier Arbulu <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96/templates/scale_up_resources.j2
new/saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3/templates/scale_up_resources.j2
---
old/saphanabootstrap-formula-0.7.0+git.1615795713.39bbb96/templates/scale_up_resources.j2
2021-03-15 09:08:33.000000000 +0100
+++
new/saphanabootstrap-formula-0.7.0+git.1616053711.09a6ec3/templates/scale_up_resources.j2
2021-03-18 08:48:31.000000000 +0100
@@ -5,9 +5,13 @@
{%- set native_fencing = data.native_fencing|default(True) %}
{%- set monitoring_enabled = pillar.cluster.monitoring_enabled|default(False)
%}
-#
-# defaults
-#
+{%- if cloud_provider == "google-cloud-platform" %}
+{%- set vip_mechanism = data.virtual_ip_mechanism|default("load-balancer") %}
+{%- endif %}
+
+###########
+# Defaults
+###########
rsc_defaults \
resource-stickiness="1000" \
@@ -16,20 +20,12 @@
op_defaults \
timeout="600"
-{%- if cloud_provider not in ["amazon-web-services", "google-cloud-platform"]
%}
-{%- set nic = "nic="~pillar.cluster.interface|json if pillar.cluster.interface
is defined else "" %}
-
-primitive rsc_ip_{{ sid }}_HDB{{ instance }} ocf:heartbeat:IPaddr2 \
- params \
- ip="{{ data.virtual_ip }}" cidr_netmask="{{
data.virtual_ip_mask|default("32") }}" {{ nic }} \
- op start timeout="20" op stop timeout="20" \
- op monitor interval="10" timeout="20"
-{%- endif %}
-
-# Platform dependant (stonith, virtual ip address, cib options, etc) resource
-{%- if cloud_provider == "amazon-web-services" %}
+#####################################################
+# Fencing agents - Native agents for cloud providers
+#####################################################
{%- if native_fencing %}
+{%- if cloud_provider == "amazon-web-services" %}
property $id="cib-bootstrap-options" \
stonith-enabled="true" \
stonith-action="off" \
@@ -41,8 +37,27 @@
op stop interval=0 timeout=180 \
op monitor interval=120 timeout=60 \
meta target-role=Started
+
+{%- elif cloud_provider == "google-cloud-platform" %}
+
+property $id="cib-bootstrap-options" \
+ stonith-enabled="true"
+
+# This stonith resource will be duplicated for each node in the cluster
+primitive rsc_gcp_stonith_{{ sid }}_HDB{{ instance }}_{{ 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 %}
{%- endif %}
+######################################
+# Floating IP address resource agents
+######################################
+
+{%- set nic = "nic="~pillar.cluster.interface|json if pillar.cluster.interface
is defined else "" %}
+{%- if cloud_provider == "amazon-web-services" %}
+
primitive rsc_aws_vip_{{ sid }}_HDB{{ instance }} ocf:suse:aws-vpc-move-ip \
params ip={{ data.virtual_ip }} routing_table={{ data.route_table }} \
interface={{ pillar.cluster.interface|default('eth0')|json }} profile={{
data.cluster_profile }} \
@@ -53,13 +68,23 @@
colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: rsc_aws_vip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
{%- elif cloud_provider == "google-cloud-platform" %}
+{%- if vip_mechanism == "load-balancer" %}
-{%- if native_fencing %}
-# This stonith resource will be duplicated for each node in the cluster
-primitive rsc_gcp_stonith_{{ sid }}_HDB{{ instance }}_{{ 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_socat_{{ sid }}_HDB{{ instance }} anything \
+ params binfile="/usr/bin/socat" \
+ cmdline_options="-U TCP-LISTEN:625{{ instance }},backlog=10,fork,reuseaddr
/dev/null" \
+ op monitor timeout=20s interval=10 \
+ op_params depth=0
+
+primitive rsc_ip_{{ sid }}_HDB{{ instance }} IPaddr2 \
+ params ip={{ data.virtual_ip }} cidr_netmask="{{
data.virtual_ip_mask|default("32") }}" {{ nic }} \
+ op monitor interval=10s
+
+group g_ip_{{ sid }}_HDB{{ instance }} rsc_ip_{{ sid }}_HDB{{ instance }}
rsc_socat_{{ sid }}_HDB{{ instance }}
+
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 4000: g_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
+
+{%- elif vip_mechanism == "route" %}
primitive rsc_gcp_vip_{{ sid }}_HDB{{ instance }}
ocf:heartbeat:gcp-vpc-move-route \
params ip={{ data.virtual_ip }} vpc_network={{ data.vpc_network_name }}
route_name={{ data.route_name }} \
@@ -69,8 +94,15 @@
colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: rsc_gcp_vip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
+{%- endif %}
{%- elif cloud_provider == "microsoft-azure" %}
+primitive rsc_ip_{{ sid }}_HDB{{ instance }} ocf:heartbeat:IPaddr2 \
+ params \
+ ip="{{ data.virtual_ip }}" cidr_netmask="{{
data.virtual_ip_mask|default("32") }}" {{ nic }} \
+ op start timeout="20" op stop timeout="20" \
+ op monitor interval="10" timeout="20"
+
primitive rsc_socat_{{ sid }}_HDB{{ instance }} azure-lb \
params port=625{{ instance }} \
op monitor timeout="20" interval="10" depth="0"
@@ -80,11 +112,20 @@
colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 4000: g_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
{%- else %}
+
+primitive rsc_ip_{{ sid }}_HDB{{ instance }} ocf:heartbeat:IPaddr2 \
+ params \
+ ip="{{ data.virtual_ip }}" cidr_netmask="{{
data.virtual_ip_mask|default("32") }}" {{ nic }} \
+ op start timeout="20" op stop timeout="20" \
+ op monitor interval="10" timeout="20"
+
colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: rsc_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
{%- endif %}
+#####################
# SAP HANA resources
+#####################
primitive rsc_SAPHanaTopology_{{ sid }}_HDB{{ instance }}
ocf:suse:SAPHanaTopology \
params \
@@ -115,15 +156,15 @@
order ord_SAPHana_{{ sid }}_HDB{{ instance }} Optional: cln_SAPHanaTopology_{{
sid }}_HDB{{ instance }} msl_SAPHana_{{ sid }}_HDB{{ instance }}
+#######################################
+# non-production HANA - Cost optimized
+#######################################
+
{%- if data.cost_optimized_parameters is defined %}
{%- set qas_sid = data.cost_optimized_parameters.sid.upper() %}
{%- set qas_instance =
'{:0>2}'.format(data.cost_optimized_parameters.instance) %}
{%- set qas_remote_host = data.cost_optimized_parameters.remote_host %}
-#
-# non-production HANA
-#
-
primitive rsc_SAP_{{ qas_sid }}_HDB{{ qas_instance }}
ocf:heartbeat:SAPDatabase \
params DBTYPE="HDB" SID="{{ qas_sid }}" \
MONITOR_SERVICES="hdbindexserver|hdbnameserver" \
@@ -142,16 +183,12 @@
{%- endif %}
+###############################
# Active/Active HANA resources
+###############################
{%- if data.virtual_ip_secondary is defined %}
-{%- if cloud_provider not in ["amazon-web-services", "google-cloud-platform"]
%}
-
-primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled ocf:heartbeat:IPaddr2
\
- op monitor interval="10s" timeout="20s" \
- params ip={{ data.virtual_ip_secondary }}
-
-{%- elif cloud_provider == "amazon-web-services" %}
+{%- if cloud_provider == "amazon-web-services" %}
primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled
ocf:suse:aws-vpc-move-ip \
params ip={{ data.virtual_ip_secondary }} routing_table={{
data.route_table }} \
@@ -160,7 +197,29 @@
op stop interval=0 timeout=180 \
op monitor interval=60 timeout=60
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }}_readenabled 2000: \
+ rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled:Started msl_SAPHana_{{ sid
}}_HDB{{ instance }}:Slave
+
{%- elif cloud_provider == "google-cloud-platform" %}
+{%- if vip_mechanism == "load-balancer" %}
+
+primitive rsc_socat_{{ sid }}_HDB{{ instance }}_readenabled anything \
+ params binfile="/usr/bin/socat" \
+ cmdline_options="-U TCP-LISTEN:626{{ instance }},backlog=10,fork,reuseaddr
/dev/null" \
+ op monitor timeout=20s interval=10 \
+ op_params depth=0
+
+primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled IPaddr2 \
+ params ip={{ data.virtual_ip_secondary }} cidr_netmask="{{
data.virtual_ip_mask|default("32") }}" {{ nic }} \
+ op monitor interval=10s
+
+group g_ip_{{ sid }}_HDB{{ instance }}_readenabled \
+ rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled rsc_socat_{{ sid }}_HDB{{
instance }}_readenabled
+
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }}_readenabled 4000: \
+ g_ip_{{ sid }}_HDB{{ instance }}_readenabled:Started msl_SAPHana_{{ sid
}}_HDB{{ instance }}:Slave
+
+{%- elif vip_mechanism == "route" %}
primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled
ocf:heartbeat:gcp-vpc-move-route \
params ip={{ data.virtual_ip_secondary }} vpc_network={{
data.vpc_network_name }} route_name={{ data.route_name_secondary }} \
@@ -168,9 +227,15 @@
op stop interval=0 timeout=180 \
op monitor interval=60 timeout=60
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }}_readenabled 2000: \
+ rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled:Started msl_SAPHana_{{ sid
}}_HDB{{ instance }}:Slave
+
{%- endif %}
+{%- elif cloud_provider == "microsoft-azure" %}
-{%- if cloud_provider == "microsoft-azure" %}
+primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled ocf:heartbeat:IPaddr2
\
+ op monitor interval="10s" timeout="20s" \
+ params ip={{ data.virtual_ip_secondary }}
primitive rsc_socat_{{ sid }}_HDB{{ instance }}_readenabled azure-lb \
params port=626{{ instance }} \
@@ -184,13 +249,19 @@
{%- else %}
+primitive rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled ocf:heartbeat:IPaddr2
\
+ op monitor interval="10s" timeout="20s" \
+ params ip={{ data.virtual_ip_secondary }}
+
colocation col_saphana_ip_{{ sid }}_HDB{{ instance }}_readenabled 2000: \
rsc_ip_{{ sid }}_HDB{{ instance }}_readenabled:Started msl_SAPHana_{{ sid
}}_HDB{{ instance }}:Slave
{%- endif %}
{%- endif %}
-# hanadb_exporter resource
+######################################
+# prometheus-hanadb_exporter resource
+######################################
{%- if monitoring_enabled %}
