Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2019-12-17 13:30:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Tue Dec 17 13:30:42 2019 rev:6 rq:757508 version:0.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2019-12-05 17:38:41.917366532 +0100
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.4691/saphanabootstrap-formula.changes
2019-12-17 13:30:48.215395708 +0100
@@ -1,0 +2,13 @@
+Thu Dec 12 11:52:23 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.4.0
+ * Update exporter state to use the new hanadb_exporter config
+ folder
+ * Clean defaults.yaml file content
+ * Fix the scenario where the primary was not defined during
+ secondary installation. Now the password can be retrieved using
+ other options
+ * Update the scale up template to remove the default value for nic
+ parameter in the IPaddr2 resource if the provider is not gcp
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.3.3.tar.gz
New:
----
saphanabootstrap-formula-0.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.6cEOo7/_old 2019-12-17 13:30:49.375395300 +0100
+++ /var/tmp/diff_new_pack.6cEOo7/_new 2019-12-17 13:30:49.375395300 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.3.3
+Version: 0.4.0
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
++++++ saphanabootstrap-formula-0.3.3.tar.gz ->
saphanabootstrap-formula-0.4.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.3.3/hana/defaults.yaml
new/saphanabootstrap-formula-0.4.0/hana/defaults.yaml
--- old/saphanabootstrap-formula-0.3.3/hana/defaults.yaml 2019-12-04
16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/hana/defaults.yaml 2019-12-17
11:56:28.137048633 +0100
@@ -1,44 +1,3 @@
hana:
install_packages: true
- nodes:
- - host: 'hana01'
- sid: 'prd'
- instance: '"00"'
- password: 'Qwerty1234'
- install:
- software_path: '/root/sap_inst/51052481'
- root_user: 'root'
- root_password: 's'
- system_user_password: 'Qwerty1234'
- primary:
- name: NUREMBERG
- backup:
- user: 'backupkey'
- password: 'Qwerty1234'
- database: 'SYSTEMDB'
- file: 'backup'
- userkey:
- key: 'backupkey'
- environment: 'hana01:30013'
- user: 'SYSTEM'
- password: 'Qwerty1234'
- database: 'SYSTEMDB'
-
- - host: 'hana02'
- sid: 'prd'
- instance: '"00"'
- password: 'Qwerty1234'
- install:
- software_path: '/root/sap_inst/51052481'
- root_user: 'root'
- root_password: 's'
- system_user_password: 'Qwerty1234'
- extra_parameters:
- hostname: 'hana02'
- secondary:
- name: PRAGUE
- remote_host: 'hana01'
- remote_instance: '00'
- replication_mode: 'sync'
- operation_mode: 'logreplay'
- timeout: 600
+ nodes: []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.3.3/hana/enable_secondary.sls
new/saphanabootstrap-formula-0.4.0/hana/enable_secondary.sls
--- old/saphanabootstrap-formula-0.3.3/hana/enable_secondary.sls
2019-12-04 16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/hana/enable_secondary.sls
2019-12-17 11:56:28.137048633 +0100
@@ -3,9 +3,21 @@
{% for node in hana.nodes if node.host == host and node.secondary is defined %}
-{% for prim_node in hana.nodes %}
-{% if node.secondary.remote_host == prim_node.host and prim_node.primary is
defined %}
-{% set primary_pass = prim_node.password %}
+# The primary password is retrieved in this order
+# 1. If the primary node is defined in the pillar, primary password will be
used
+# 2. If secondary.primary_pass is defined this password will be used
+# 3. The secondary machine password will be used
+{% set password = {} %}
+
+{% for prim_node in hana.nodes if node.secondary.remote_host == prim_node.host
and prim_node.primary is defined %}
+{% do password.update({'primary': prim_node.password }) %}
+{% endfor %}
+
+{% if password.primary is not defined and node.secondary.primary_password is
defined %}
+{% do password.update({'primary': node.secondary.primary_password }) %}
+{% elif password.primary is not defined %}
+{% do password.update({'primary': node.password }) %}
+{% endif %}
{{ node.secondary.name }}:
hana.sr_secondary_registered:
@@ -18,8 +30,7 @@
- operation_mode: {{ node.secondary.operation_mode }}
- timeout: {{ node.secondary.primary_timeout|default(100) }}
- interval: {{ node.secondary.interval|default(10) }}
- - primary_pass: {{ primary_pass }}
+ - primary_pass: {{ password.primary }}
+
-{% endif %}
-{% endfor %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.3.3/hana/exporter.sls
new/saphanabootstrap-formula-0.4.0/hana/exporter.sls
--- old/saphanabootstrap-formula-0.3.3/hana/exporter.sls 2019-12-04
16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/hana/exporter.sls 2019-12-17
11:56:28.137048633 +0100
@@ -21,6 +21,20 @@
interval: 15
{% endif %}
+configure_exporter_logging_{{ daemon_instance }}:
+ file.managed:
+ - name: /etc/hanadb_exporter/logging_config.ini
+ - source: /usr/etc/hanadb_exporter/logging_config.ini
+ - require:
+ - 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
+
configure_exporter_{{ daemon_instance }}:
file.managed:
- source: salt://hana/templates/hanadb_exporter.j2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.3.3/pillar.example
new/saphanabootstrap-formula-0.4.0/pillar.example
--- old/saphanabootstrap-formula-0.3.3/pillar.example 2019-12-04
16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/pillar.example 2019-12-17
11:56:28.137048633 +0100
@@ -55,6 +55,8 @@
remote_instance: '00'
replication_mode: 'sync'
operation_mode: 'logreplay'
+ # If primary node is not defined the password can we set here (primary
node password has preference)
+ #primary_password: 'Qwerty1234'
# Optional timeout value in seconds to wait until the primary node
# 100 seconds by default
primary_timeout: 100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.3.3/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.4.0/saphanabootstrap-formula.changes
--- old/saphanabootstrap-formula-0.3.3/saphanabootstrap-formula.changes
2019-12-04 16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/saphanabootstrap-formula.changes
2019-12-17 11:56:28.137048633 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Thu Dec 12 11:52:23 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.4.0
+ * Update exporter state to use the new hanadb_exporter config
+ folder
+ * Clean defaults.yaml file content
+ * Fix the scenario where the primary was not defined during
+ secondary installation. Now the password can be retrieved using
+ other options
+ * Update the scale up template to remove the default value for nic
+ parameter in the IPaddr2 resource if the provider is not gcp
+
+-------------------------------------------------------------------
Thu Nov 28 21:28:19 UTC 2019 - Simranpal Singh <[email protected]>
- Version bump 0.3.3
@@ -10,13 +23,13 @@
- Version bump 0.3.2
* Fix issue with file permissions during package installation in
/usr/share/salt-formulas (0755, root, salt)
- (boo#1142306)
+ (boo#1142306)
-------------------------------------------------------------------
Tue Oct 29 16:31:16 UTC 2019 - Xabier Arbulu <[email protected]>
- Version bump 0.3.1
- * Fix 'true' rendering in jinja to convert to json correctly
+ * Fix 'true' rendering in jinja to convert to json correctly
-------------------------------------------------------------------
Fri Oct 25 07:22:15 UTC 2019 - Xabier Arbulu <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.3.3/saphanabootstrap-formula.spec
new/saphanabootstrap-formula-0.4.0/saphanabootstrap-formula.spec
--- old/saphanabootstrap-formula-0.3.3/saphanabootstrap-formula.spec
2019-12-04 16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/saphanabootstrap-formula.spec
2019-12-17 11:56:28.137048633 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.3.3
+Version: 0.4.0
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.3.3/templates/scale_up_resources.j2
new/saphanabootstrap-formula-0.4.0/templates/scale_up_resources.j2
--- old/saphanabootstrap-formula-0.3.3/templates/scale_up_resources.j2
2019-12-04 16:21:31.793593999 +0100
+++ new/saphanabootstrap-formula-0.4.0/templates/scale_up_resources.j2
2019-12-17 11:56:28.137048633 +0100
@@ -17,9 +17,11 @@
# production HANA
#
+{% set nic = "nic="~pillar.cluster.interface|default('eth0')|json if
data.platform == "gcp" 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 data.platform == "gcp"
else data.virtual_ip_mask }}" {{ "nic=" ~
pillar.cluster.interface|default('eth0') }} \
+ ip="{{ data.virtual_ip }}" cidr_netmask="{{ 32 if data.platform == "gcp"
else data.virtual_ip_mask }}" {{ nic }} \
op start timeout="20" op stop timeout="20" \
op monitor interval="10" timeout="20"
@@ -52,11 +54,11 @@
{% if data.platform == "azure" %}
-primitive rsc_nc_{{ sid }}_HDB{{ instance }} anything \
+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_nc_{{ sid }}_HDB{{ instance }}
+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
