Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2019-07-13 13:50:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Sat Jul 13 13:50:02 2019 rev:3 rq:714879 version:0.2.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2019-07-04 15:43:21.870117930 +0200
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.4615/saphanabootstrap-formula.changes
2019-07-13 14:00:50.570889831 +0200
@@ -1,0 +2,14 @@
+Mon Jul 8 11:49:55 UTC 2019 - Dario Maiocchi <[email protected]>
+
+- Version bump 0.2.6
+ * Retry pkg.install multiple times, in case a pkg installtion fails
+ for having a more resilient installation.
+
+-------------------------------------------------------------------
+Wed Jul 3 07:58:55 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.5
+ * hanadb_exporter executed as a daemon
+ * hanadb_exporter installation suggested
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.2.4.tar.gz
New:
----
saphanabootstrap-formula-0.2.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.zTbMjN/_old 2019-07-13 14:00:51.342889595 +0200
+++ /var/tmp/diff_new_pack.zTbMjN/_new 2019-07-13 14:00:51.350889593 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.2.4
+Version: 0.2.5
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -30,6 +30,7 @@
BuildArch: noarch
Requires: habootstrap-formula
Requires: salt-shaptools
+Suggests: hanadb_exporter >= 0.3.1
# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration
location.
%if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100)
++++++ saphanabootstrap-formula-0.2.4.tar.gz ->
saphanabootstrap-formula-0.2.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.4/ci/validate-formula.sh
new/saphanabootstrap-formula-0.2.5/ci/validate-formula.sh
--- old/saphanabootstrap-formula-0.2.4/ci/validate-formula.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/saphanabootstrap-formula-0.2.5/ci/validate-formula.sh 2019-07-10
15:08:23.171420508 +0200
@@ -0,0 +1,41 @@
+#! /bin/bash
+
+# this script is intended to be executed via PRs travis CI
+set -e
+
+# 01: hana01
+
+echo "==========================================="
+echo " Using primary host "
+echo "==========================================="
+
+cp pillar.example example/pillar/hana.sls
+cp example/salt/top.sls .
+
+cat >grains <<EOF
+host: hana01
+EOF
+
+cat >minion <<EOF
+root_dir: $PWD
+id: travis
+EOF
+
+sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=example/pillar --retcode-passthrough -l debug
+
+echo
+echo "==========================================="
+echo " Using secondary host "
+echo "==========================================="
+
+cat >grains <<EOF
+host: hana02
+hana_inst_folder: myfold
+EOF
+
+cat >minion <<EOF
+root_dir: $PWD
+id: travis
+EOF
+
+sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=example/pillar --retcode-passthrough -l debug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.4/hana/exporter.sls
new/saphanabootstrap-formula-0.2.5/hana/exporter.sls
--- old/saphanabootstrap-formula-0.2.4/hana/exporter.sls 2019-07-03
10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/hana/exporter.sls 2019-07-10
15:08:23.171420508 +0200
@@ -1,38 +1,42 @@
{%- from "hana/map.jinja" import hana with context -%}
{% set host = grains['host'] %}
-{% for node in hana.nodes %}
-{% if node.host == host and node.exporter is defined %}
+{% for node in hana.nodes if node.host == host and node.exporter is defined %}
{% set instance = '{:0>2}'.format(node.instance) %}
-{% set config_file = '/etc/hanadb_exporter/config_{}_{}.json'.format(node.sid,
instance) %}
+{% set daemon_instance = '{}_{}'.format(node.sid, instance) %}
+{% set config_file = '/etc/hanadb_exporter/{}.json'.format(daemon_instance) %}
+{% if loop.first %}
hanadb_exporter:
- pkg.installed
+ pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
python3-PyHDB:
- pkg.installed
+ pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
+{% endif %}
-configure_exporter:
+configure_exporter_{{ daemon_instance }}:
file.managed:
- source: salt://hana/templates/hanadb_exporter.j2
- name: {{ config_file }}
- template: jinja
- require:
- hanadb_exporter
- - python3-PyHDB
-
-stop_exporter:
- process.absent:
- - name: hanadb_exporter -c {{ config_file }} -m
/etc/hanadb_exporter/metrics.json
- - require:
- - configure_exporter
+ - context: # set up context for template hanadb_exporter.j2
+ sid: {{ node.sid }}
-start_exporter:
- cmd.run:
- - name: nohup hanadb_exporter -c {{ config_file }} -m
/etc/hanadb_exporter/metrics.json &>/dev/null &
+start_exporter_{{ daemon_instance }}:
+ service.running:
+ - name: hanadb_exporter@{{ daemon_instance }}
+ - enable: True
+ - reload: True
- require:
- - configure_exporter
+ - configure_exporter_{{ daemon_instance }}
-{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.4/hana/packages.sls
new/saphanabootstrap-formula-0.2.5/hana/packages.sls
--- old/saphanabootstrap-formula-0.2.4/hana/packages.sls 2019-07-03
10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/hana/packages.sls 2019-07-10
15:08:23.171420508 +0200
@@ -17,6 +17,9 @@
{% else %}
install_required_packages:
pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
- pkgs:
- libnuma1
- libltdl7
@@ -30,4 +33,7 @@
python3-shaptools:
{% endif %}
pkg.installed:
+ - retry:
+ attempts: 3
+ interval: 15
- resolve_capabilities: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.4/pillar.example
new/saphanabootstrap-formula-0.2.5/pillar.example
--- old/saphanabootstrap-formula-0.2.4/pillar.example 2019-07-03
10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/pillar.example 2019-07-10
15:08:23.171420508 +0200
@@ -36,7 +36,6 @@
user: 'SYSTEM'
password: 'Qwerty1234'
-
- host: 'hana02'
sid: 'prd'
instance: 00
@@ -56,6 +55,14 @@
# Optional timeout value in seconds to wait until the primary node
# 100 seconds by default
primary_timeout: 100
+ scenario_type: 'cost-optimized'
+ cost_optimized_parameters:
+ global_allocation_limit: '32100'
+ preload_column_tables: False
+ exporter:
+ exposition_port: 8001 # Optional, 8001 by default
+ user: 'SYSTEM'
+ password: 'Qwerty1234'
- host: hana02
sid: 'qas'
@@ -67,3 +74,7 @@
root_password: 's'
system_user_password: 'Qwerty1234'
sapadm_password: 'Qwerty1234'
+ exporter:
+ exposition_port: 8002 # Optional, 8001 by default
+ user: 'SYSTEM'
+ password: 'Qwerty1234'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.4/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.changes
--- old/saphanabootstrap-formula-0.2.4/saphanabootstrap-formula.changes
2019-07-03 10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.changes
2019-07-10 15:08:23.171420508 +0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Jul 8 11:49:55 UTC 2019 - Dario Maiocchi <[email protected]>
+
+- Version bump 0.2.6
+ * Retry pkg.install multiple times, in case a pkg installtion fails
+ for having a more resilient installation.
+
+-------------------------------------------------------------------
+Wed Jul 3 07:58:55 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.5
+ * hanadb_exporter executed as a daemon
+ * hanadb_exporter installation suggested
+
+-------------------------------------------------------------------
Tue Jul 2 11:14:50 UTC 2019 - Diego Vinicius Akechi <[email protected]>
- Version bump 0.2.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.4/saphanabootstrap-formula.spec
new/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.spec
--- old/saphanabootstrap-formula-0.2.4/saphanabootstrap-formula.spec
2019-07-03 10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.spec
2019-07-10 15:08:23.171420508 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.2.4
+Version: 0.2.5
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -30,6 +30,7 @@
BuildArch: noarch
Requires: habootstrap-formula
Requires: salt-shaptools
+Suggests: hanadb_exporter >= 0.3.1
# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration
location.
%if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.4/templates/hanadb_exporter.j2
new/saphanabootstrap-formula-0.2.5/templates/hanadb_exporter.j2
--- old/saphanabootstrap-formula-0.2.4/templates/hanadb_exporter.j2
2019-07-03 10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/templates/hanadb_exporter.j2
2019-07-10 15:08:23.171420508 +0200
@@ -1,8 +1,8 @@
{%- from "hana/map.jinja" import hana with context -%}
{% set host = grains['host'] %}
-{% for node in hana.nodes %}
-{% if node.host == host and node.exporter is defined %}
+{# sid is coming from exporter.sls context #}
+{% for node in hana.nodes if node.host == host and node.exporter is defined
and node.sid == sid %}
{% set dbinst = '{:0>2}'.format(node.instance) %}
{% set node_subix = '{}_{}'.format(node.sid, dbinst) %}
@@ -21,5 +21,4 @@
}
}
-{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.4/templates/scale_up_resources.j2
new/saphanabootstrap-formula-0.2.5/templates/scale_up_resources.j2
--- old/saphanabootstrap-formula-0.2.4/templates/scale_up_resources.j2
2019-07-03 10:00:51.613343765 +0200
+++ new/saphanabootstrap-formula-0.2.5/templates/scale_up_resources.j2
2019-07-10 15:08:23.171420508 +0200
@@ -91,7 +91,7 @@
colocation col_{{ qas_sid }}_never_with_{{ sid }}-ip -inf: rsc_SAP_{{ qas_sid
}}_HDB{{ qas_instance }}:Started \
rsc_ip_{{ sid }}_HDB{{ instance }}
-order ord_{{ qas_sid }}_stop_before_{{ sid }}-promote inf: rsc_SAP_{{ qas_sid
}}_HDB{{ qas_instance }}:stop \
+order ord_{{ qas_sid }}_stop_before_{{ sid }}-promote Mandatory: rsc_SAP_{{
qas_sid }}_HDB{{ qas_instance }}:stop \
msl_SAPHana_{{ sid }}_HDB{{ instance }}:promote
{% endif %}
