Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2020-03-05 23:23:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Thu Mar 5 23:23:13 2020 rev:10 rq:781775 version:0.5.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2020-01-25 13:24:58.896058155 +0100
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.26092/saphanabootstrap-formula.changes
2020-03-05 23:23:39.301356213 +0100
@@ -1,0 +2,12 @@
+Tue Feb 11 10:51:56 UTC 2020 - Dario Maiocchi <[email protected]>
+
+- Version 0.5.0
+ * Change the package name to prometheus-hanadb_exporter (jsc#SLE-10545)
+
+-------------------------------------------------------------------
+Thu Jan 30 15:31:06 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version 0.4.4
+ * Update HANA resources template to add AWS specific RA
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.4.3.tar.gz
New:
----
saphanabootstrap-formula-0.5.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.YJ0AYn/_old 2020-03-05 23:23:40.977357134 +0100
+++ /var/tmp/diff_new_pack.YJ0AYn/_new 2020-03-05 23:23:40.981357136 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.4.3
+Version: 0.5.0
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -31,7 +31,7 @@
Requires: habootstrap-formula
Requires: salt-shaptools
Requires: salt-formulas-configuration
-Suggests: hanadb_exporter >= 0.5.0
+Suggests: prometheus-hanadb_exporter >= 0.7.0
%define fname hana
%define fdir %{_datadir}/salt-formulas
++++++ saphanabootstrap-formula-0.4.3.tar.gz ->
saphanabootstrap-formula-0.5.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.4.3/hana/exporter.sls
new/saphanabootstrap-formula-0.5.0/hana/exporter.sls
--- old/saphanabootstrap-formula-0.4.3/hana/exporter.sls 2020-01-22
18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/hana/exporter.sls 2020-02-12
14:15:12.287083920 +0100
@@ -8,7 +8,7 @@
{% set config_file = '/etc/hanadb_exporter/{}.json'.format(daemon_instance) %}
{% if loop.first %}
-hanadb_exporter:
+prometheus-hanadb_exporter:
pkg.installed:
- retry:
attempts: 3
@@ -26,14 +26,14 @@
- name: /etc/hanadb_exporter/logging_config.ini
- source: /usr/etc/hanadb_exporter/logging_config.ini
- require:
- - hanadb_exporter
+ - prometheus-hanadb_exporter
configure_exporter_metrics_{{ daemon_instance }}:
file.managed:
- name: /etc/hanadb_exporter/metrics.json
- source: /usr/etc/hanadb_exporter/metrics.json
- require:
- - hanadb_exporter
+ - prometheus-hanadb_exporter
configure_exporter_{{ daemon_instance }}:
file.managed:
@@ -41,13 +41,13 @@
- name: {{ config_file }}
- template: jinja
- require:
- - hanadb_exporter
+ - prometheus-hanadb_exporter
- context: # set up context for template hanadb_exporter.j2
sid: {{ node.sid }}
start_exporter_{{ daemon_instance }}:
service.running:
- - name: hanadb_exporter@{{ daemon_instance }}
+ - name: prometheus-hanadb_exporter@{{ daemon_instance }}
- enable: True
- reload: True
- require:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.4.3/pillar.example
new/saphanabootstrap-formula-0.5.0/pillar.example
--- old/saphanabootstrap-formula-0.4.3/pillar.example 2020-01-22
18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/pillar.example 2020-02-12
14:15:12.287083920 +0100
@@ -41,7 +41,7 @@
file: 'backup'
# Optional: Add hanadb_exporter to the instance
exporter:
- exposition_port: 8001 # Optional, 8001 by default
+ exposition_port: 9668 # Optional, 9668 by default
multi_tenant: true # Enable the exporter as multi tenant. This will
create the connection with the SYSTEMDB database and all tenants
user: 'SYSTEM'
password: 'Qwerty1234'
@@ -75,7 +75,7 @@
global_allocation_limit: '32100'
preload_column_tables: False
exporter:
- exposition_port: 8001 # Optional, 8001 by default
+ exposition_port: 9668 # Optional, 9668 by default
user: 'SYSTEM'
password: 'Qwerty1234'
@@ -90,6 +90,6 @@
system_user_password: 'Qwerty1234'
sapadm_password: 'Qwerty1234'
exporter:
- exposition_port: 8002 # Optional, 8001 by default
+ exposition_port: 9669 # Optional, 9668 by default
user: 'SYSTEM'
password: 'Qwerty1234'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.4.3/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.5.0/saphanabootstrap-formula.changes
--- old/saphanabootstrap-formula-0.4.3/saphanabootstrap-formula.changes
2020-01-22 18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/saphanabootstrap-formula.changes
2020-02-12 14:15:12.287083920 +0100
@@ -1,7 +1,19 @@
-------------------------------------------------------------------
+Tue Feb 11 10:51:56 UTC 2020 - Dario Maiocchi <[email protected]>
+
+- Version 0.5.0
+ * Change the package name to prometheus-hanadb_exporter (jsc#SLE-10545)
+
+-------------------------------------------------------------------
+Thu Jan 30 15:31:06 UTC 2020 - Xabier Arbulu <[email protected]>
+
+- Version 0.4.4
+ * Update HANA resources template to add AWS specific RA
+
+-------------------------------------------------------------------
Tue Jan 21 14:41:29 UTC 2020 - Dario Maiocchi <[email protected]>
-- Version 0.4.3
+- Version 0.4.3
* Add saptune module to apply a specific solution
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.4.3/saphanabootstrap-formula.spec
new/saphanabootstrap-formula-0.5.0/saphanabootstrap-formula.spec
--- old/saphanabootstrap-formula-0.4.3/saphanabootstrap-formula.spec
2020-01-22 18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/saphanabootstrap-formula.spec
2020-02-12 14:15:12.287083920 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.4.3
+Version: 0.5.0
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -31,7 +31,7 @@
Requires: habootstrap-formula
Requires: salt-shaptools
Requires: salt-formulas-configuration
-Suggests: hanadb_exporter >= 0.5.0
+Suggests: prometheus-hanadb_exporter >= 0.7.0
%define fname hana
%define fdir %{_datadir}/salt-formulas
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.4.3/templates/hanadb_exporter.j2
new/saphanabootstrap-formula-0.5.0/templates/hanadb_exporter.j2
--- old/saphanabootstrap-formula-0.4.3/templates/hanadb_exporter.j2
2020-01-22 18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/templates/hanadb_exporter.j2
2020-02-12 14:15:12.287083920 +0100
@@ -8,7 +8,7 @@
{% set node_subix = '{}_{}'.format(node.sid, dbinst) %}
{
- "exposition_port": {{ node.exporter.exposition_port|default(8001) }},
+ "exposition_port": {{ node.exporter.exposition_port|default(9668) }},
"multi_tenant": {{ node.exporter.multi_tenant|default(true)|tojson }},
"timeout": {{node.exporter.timeout|default(600)}},
"hana": {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.4.3/templates/scale_up_resources.j2
new/saphanabootstrap-formula-0.5.0/templates/scale_up_resources.j2
--- old/saphanabootstrap-formula-0.4.3/templates/scale_up_resources.j2
2020-01-22 18:17:54.931430466 +0100
+++ new/saphanabootstrap-formula-0.5.0/templates/scale_up_resources.j2
2020-02-12 14:15:12.287083920 +0100
@@ -1,7 +1,7 @@
-{% set data = pillar.cluster.configure.template.parameters %}
-{% set sid = data.sid.upper() %}
-{% set instance = '{:0>2}'.format(data.instance) %}
-{% set cloud_provider = grains['cloud_provider'] %}
+{%- set data = pillar.cluster.configure.template.parameters %}
+{%- set sid = data.sid.upper() %}
+{%- set instance = '{:0>2}'.format(data.instance) %}
+{%- set cloud_provider = grains['cloud_provider'] %}
#
# defaults
@@ -14,17 +14,57 @@
op_defaults \
timeout="600"
-#
-# production HANA
-#
-
-{% set nic = "nic="~pillar.cluster.interface|default('eth0')|json if
cloud_provider == "google-cloud-platform" else
"nic="~pillar.cluster.interface|json if pillar.cluster.interface is defined
else "" %}
+{%- if cloud_provider not in ["amazon-web-services"] %}
+# Create virtual ip. gcp must be changed when gcp-vpc-move-route RA is
available
+{%- set nic = "nic="~pillar.cluster.interface|default('eth0')|json if
cloud_provider == "google-cloud-platform" else
"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="{{ 32 if cloud_provider ==
"google-cloud-platform" else data.virtual_ip_mask }}" {{ 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" %}
+
+property $id="cib-bootstrap-options" \
+ stonith-enabled="true" \
+ stonith-action="off" \
+ stonith-timeout="150s"
+
+primitive res_aws_stonith_{{ sid }}_HDB{{ instance }} 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
+
+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}} \
+ op start interval=0 timeout=180 \
+ op stop interval=0 timeout=180 \
+ op monitor interval=60 timeout=60
+
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: rsc_aws_vip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
+
+{%- elif cloud_provider == "microsoft-azure" %}
+
+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="20" interval="10" depth="0"
+
+group g_ip_{{ sid }}_HDB{{ instance }} rsc_ip_{{ sid }}_HDB{{ instance }}
rsc_socat_{{ sid }}_HDB{{ instance }}
+
+colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: g_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
+
+{%- else %}
+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 \
@@ -53,28 +93,12 @@
ms msl_SAPHana_{{ sid }}_HDB{{ instance }} rsc_SAPHana_{{ sid }}_HDB{{
instance }} \
meta clone-max="2" clone-node-max="1" interleave="true"
-{% if cloud_provider == "microsoft-azure" %}
-
-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="20" interval="10" depth="0"
-
-group g_ip_{{ sid }}_HDB{{ instance }} rsc_ip_{{ sid }}_HDB{{ instance }}
rsc_socat_{{ sid }}_HDB{{ instance }}
-
-colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: g_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
-
-{% else %}
-
-colocation col_saphana_ip_{{ sid }}_HDB{{ instance }} 2000: rsc_ip_{{ sid
}}_HDB{{ instance }}:Started msl_SAPHana_{{ sid }}_HDB{{ instance }}:Master
-
-{% endif %}
-
order ord_SAPHana_{{ sid }}_HDB{{ instance }} Optional: cln_SAPHanaTopology_{{
sid }}_HDB{{ instance }} msl_SAPHana_{{ sid }}_HDB{{ instance }}
-{% 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 %}
+{%- 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
@@ -91,9 +115,9 @@
location loc_{{ qas_sid }}_never_on_{{ qas_remote_host }} rsc_SAP_{{ qas_sid
}}_HDB{{ qas_instance }} -inf: {{ qas_remote_host }}
colocation col_{{ qas_sid }}_never_with_{{ sid }}-ip -inf: rsc_SAP_{{ qas_sid
}}_HDB{{ qas_instance }}:Started \
- rsc_ip_{{ sid }}_HDB{{ instance }}
+ rsc_ip_{{ sid }}_HDB{{ instance }}
order ord_{{ qas_sid }}_stop_before_{{ sid }}-promote Mandatory: rsc_SAP_{{
qas_sid }}_HDB{{ qas_instance }}:stop \
- msl_SAPHana_{{ sid }}_HDB{{ instance }}:promote
+ msl_SAPHana_{{ sid }}_HDB{{ instance }}:promote
-{% endif %}
+{%- endif %}
