Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2019-11-13 13:29:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Wed Nov 13 13:29:07 2019 rev:4 rq:748023 version:0.3.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2019-07-13 14:00:50.570889831 +0200
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.2990/saphanabootstrap-formula.changes
2019-11-13 13:29:08.535748785 +0100
@@ -1,0 +2,55 @@
+Wed Oct 30 16:14:32 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.2
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas (0755, root, salt)
+ (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
+
+-------------------------------------------------------------------
+Fri Oct 25 07:22:15 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.0
+ * Add support for multi tenant hanadb_exporter
+
+-------------------------------------------------------------------
+Wed Sep 4 06:55:01 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Update the pkg.info_available call to avoid repositories refresh as
+ it may cause errors
+
+-------------------------------------------------------------------
+Wed Aug 7 07:46:25 UTC 2019 - Simranpal Singh <[email protected]>
+
+- Version bump 0.2.9
+ * Fix srHook script usage for cost optimized scenario
+ * Add scenario type options to the form.yml file
+ (boo#1137989)
+
+-------------------------------------------------------------------
+Wed Jul 31 12:26:05 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Fix errors in the form.yml file to match with the formula names
+- Fix some styling issues
+
+-------------------------------------------------------------------
+Tue Jul 23 11:17:36 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.8
+ * Add support for Power machines
+ * Fix issues with SAP HANA deployment template and the exporter
+
+-------------------------------------------------------------------
+Mon Jul 22 08:26:16 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.7
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas
+ (boo#1142306)
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.2.5.tar.gz
New:
----
saphanabootstrap-formula-0.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.hSMkSF/_old 2019-11-13 13:29:08.975749245 +0100
+++ /var/tmp/diff_new_pack.hSMkSF/_new 2019-11-13 13:29:08.979749250 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.2.5
+Version: 0.3.2
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -30,12 +30,8 @@
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)
-Requires: salt-standalone-formulas-configuration
-%endif
+Requires: salt-formulas-configuration
+Suggests: hanadb_exporter >= 0.5.0
%define fname hana
%define fdir %{_datadir}/salt-formulas
@@ -54,16 +50,6 @@
%install
-# before SUMA 4.0/15-SP1, install on the standard Salt Location.
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
-
-mkdir -p %{buildroot}/srv/salt/
-cp -R %{fname} %{buildroot}/srv/salt/
-cp -R %{ftemplates} %{buildroot}/srv/salt/%{fname}/
-
-%else
-
-# On SUMA 4.0/15-SP1, a single shared directory will be used.
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
@@ -74,9 +60,7 @@
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
fi
-%endif
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
%files
%defattr(-,root,root,-)
%if 0%{?sle_version} < 120300
@@ -85,28 +69,13 @@
%doc README.md
%license LICENSE
%endif
-/srv/salt/%{fname}
-/srv/salt/%{fname}/%{ftemplates}
-
-%dir %attr(0755, root, salt) /srv/salt
-%else
-
-%files
-%defattr(-,root,root,-)
-%doc README.md
-%license LICENSE
-%dir %{fdir}
-%dir %{fdir}/states
-%dir %{fdir}/metadata
-%{fdir}/states/%{fname}
-%{fdir}/states/%{fname}/%{ftemplates}
-%{fdir}/metadata/%{fname}
-
-%dir %attr(0750, root, salt) %{fdir}
-%dir %attr(0750, root, salt) %{fdir}/states
-%dir %attr(0750, root, salt) %{fdir}/metadata
-
-%endif
+%dir %attr(0755, root, salt) %{fdir}
+%dir %attr(0755, root, salt) %{fdir}/states
+%dir %attr(0755, root, salt) %{fdir}/metadata
+
+%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/states/%{fname}/%{ftemplates}
+%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
++++++ saphanabootstrap-formula-0.2.5.tar.gz ->
saphanabootstrap-formula-0.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.5/VERSION
new/saphanabootstrap-formula-0.3.2/VERSION
--- old/saphanabootstrap-formula-0.2.5/VERSION 2019-07-10 15:08:23.171420508
+0200
+++ new/saphanabootstrap-formula-0.3.2/VERSION 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-0.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/ci/validate-formula.sh
new/saphanabootstrap-formula-0.3.2/ci/validate-formula.sh
--- old/saphanabootstrap-formula-0.2.5/ci/validate-formula.sh 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/ci/validate-formula.sh 2019-11-12
17:20:17.199771714 +0100
@@ -23,7 +23,7 @@
sudo salt-call state.show_highstate --local --file-root=./ --config-dir=.
--pillar-root=example/pillar --retcode-passthrough -l debug
-echo
+echo
echo "==========================================="
echo " Using secondary host "
echo "==========================================="
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.5/form.yml
new/saphanabootstrap-formula-0.3.2/form.yml
--- old/saphanabootstrap-formula-0.2.5/form.yml 2019-07-10 15:08:23.171420508
+0200
+++ new/saphanabootstrap-formula-0.3.2/form.yml 2019-11-12 17:20:17.199771714
+0100
@@ -1,6 +1,11 @@
hana:
$name: HANA
$type: group
+ install_packages:
+ $name: Install required packages
+ $type: boolean
+ $default: true
+ $help: Install all required packages from currently existing repositories
nodes:
$name: Nodes
$type: edit-group
@@ -25,6 +30,26 @@
$type: password
$optional: false
$help: This is the OS <sid>adm user password. Will be used to check if
there is an already installed HANA.
+ scenario_type:
+ $name: HANA scenario type
+ $type: select
+ $values: [performance-optimized, cost-optimized]
+ cost_optimized_parameters:
+ $name: HANA parameters for cost-optimized
+ $visibleIf: .scenario_type == cost-optimized
+ $optional: true
+ $type: group
+ global_allocation_limit:
+ $name: HANA memory allocation limit
+ $type: text
+ $optional: false
+ $help: This is the memory size limit to be set for HANA in Mb
+ preload_column_tables:
+ $name: HANA preload column tables
+ $type: boolean
+ $default: false
+ $optional: false
+ $help: Choose this option to set the HANA behavior of preloading
column tables on startup
install_checkbox:
$name: Install HANA
$type: boolean
@@ -103,14 +128,18 @@
$optional: true
$visibleIf: .create_backup == true
$type: group
- user:
+ key_name:
$name: Key Name (hdbuserstore)
$type: text
- $optional: false
- password:
+ $optional: true
+ user_name:
+ $name: SAP user
+ $type: text
+ $optional: true
+ user_password:
$name: SAP user password
$type: password
- $optional: false
+ $optional: true
database:
$name: Database name to backup
$type: text
@@ -131,7 +160,7 @@
$optional: true
$visibleIf: .create_userkey == true
$type: group
- key:
+ key_name:
$name: New key name
$type: text
$optional: false
@@ -140,13 +169,15 @@
$type: text
$optional: false
$help: Use the format <host>:<port number>
- user:
+ user_name:
+ $name: SAP user
$type: text
$default: SYSTEM
$optional: false
- password:
- $name: User password
+ user_password:
+ $name: SAP user password
$type: password
+ $optional: false
database:
$name: Database name
$type: text
@@ -179,10 +210,14 @@
$name: Operation mode
$type: select
$values: [logreplay, delta_datashipping]
- timeout:
+ primary_timeout:
$name: Timeout to wait until the primary node is enabled
$type: text
$optional: true
+ interval:
+ $name: Interval used to check if the primary instance is ready
+ $type: text
+ $optional: true
add_exporter:
$name: Add SAP HANA database metrics exporter
@@ -195,9 +230,14 @@
$visibleIf: .add_exporter == true
$type: group
exposition_port:
- $name: SAP HANA exposter exposition port
+ $name: SAP HANA exporter exposition port
$type: text
- $optional: true
+ $optional: false
+ multi_tenant:
+ $name: Enable Multi tenant monitoring
+ $type: boolean
+ $default: true
+ $help: If enabled, the exporter will select all the tenants listed
on the SYSTEMDB metadata and open a connection to each of them in order to
collect metrics
user:
$name: SAP HANA user
$type: text
@@ -207,3 +247,15 @@
$name: SAP HANA password
$type: password
$optional: false
+ port:
+ $name: HANA database port
+ $type: text
+ $default: 30013
+ $optional: false
+ $help: If multi tenant is enabled, this port must point to a
SYSTEMDB database port (3XX13 be default)
+ timeout:
+ $name: Connection timeout
+ $type: text
+ $default: 600
+ $optional: true
+ $help: Timeout in seconds for HANA database connection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/hana/enable_cost_optimized.sls
new/saphanabootstrap-formula-0.3.2/hana/enable_cost_optimized.sls
--- old/saphanabootstrap-formula-0.2.5/hana/enable_cost_optimized.sls
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/enable_cost_optimized.sls
2019-11-12 17:20:17.199771714 +0100
@@ -28,28 +28,82 @@
- group: sapsys
- mode: 755
- makedirs: True
+ - require:
+ - reduce_memory_resources_{{ node.host+node.sid }}
install_srTakeover_hook:
file.managed:
- source: salt://hana/templates/srTakeover_hook.j2
- - name: /hana/shared/srHook/sr-Takeover.py
+ - name: /hana/shared/srHook/srTakeover.py
- user: {{ node.sid.lower() }}adm
- group: sapsys
+ - mode: 755
- template: jinja
- require:
- - reduce_memory_resources_{{ node.host+node.sid }}
- setup_srHook_directory
-install_hana_python_packages:
+{% set platform = grains['cpuarch'].upper() %}
+{% if platform not in ['X86_64', 'PPC64LE'] %}
+failure:
+ test.fail_with_changes:
+ - name: 'not supported platform. only x86_64 and ppc64le are supported'
+ - failhard: True
+{% endif %}
+
+{% set py_packages_folder =
'{}/DATA_UNITS/HDB_CLIENT_LINUX_{}/client/PYDBAPI.TGZ'.format(grains['hana_inst_folder'],
platform) %}
+
+extract_hana_pydbapi_archive:
archive.extracted:
- name: /hana/shared/srHook
+ - enforce_toplevel: False
+ - source: {{ py_packages_folder }}
+ - options: --transform 's|-[0-9]*\.[0-9]*\.[0-9]*|-package|' --wildcards
'hdbcli*'
+ - require:
+ - setup_srHook_directory
+
+extract_hdbcli_client_files:
+ archive.extracted:
+ - name: /hana/shared/srHook/
+ - source: /hana/shared/srHook/hdbcli-package.tar.gz
+ - enforce_toplevel: False
+ - options: --strip=2 --wildcards '*/hdbcli/*.py'
+ - require:
+ - extract_hana_pydbapi_archive
+
+remove_hdbcli_tar_package:
+ file.absent:
+ - names:
+ - /hana/shared/srHook/hdbcli-package.tar.gz
+ - /hana/shared/srHook/hdbcli
+ - require:
+ - extract_hdbcli_client_files
+
+chmod_hdbcli_client_files:
+ file.managed:
- user: {{ node.sid.lower() }}adm
- group: sapsys
- - enforce_toplevel: False
- - source: {{
grains['hana_inst_folder']~'/DATA_UNITS/HDB_CLIENT_LINUX_X86_64/client/PYDBAPI.TGZ'
}}
+ - mode: 755
+ - names:
+ - /hana/shared/srHook/dbapi.py
+ - /hana/shared/srHook/resultrow.py
+ - /hana/shared/srHook/__init__.py
+ - require:
+ - extract_hdbcli_client_files
+
+configure_ha_dr_provider_srTakeover:
+ file.append:
+ - name: /hana/shared/{{ node.sid.upper()
}}/global/hdb/custom/config/global.ini
+ - text: |
+
+ [ha_dr_provider_srTakeover]
+ provider = srTakeover
+ path = /hana/shared/srHook
+ execution_order = 1
- require:
- reduce_memory_resources_{{ node.host+node.sid }}
- setup_srHook_directory
+ - install_srTakeover_hook
+ - extract_hdbcli_client_files
{% endif %}
{% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/hana/enable_primary.sls
new/saphanabootstrap-formula-0.3.2/hana/enable_primary.sls
--- old/saphanabootstrap-formula-0.2.5/hana/enable_primary.sls 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/enable_primary.sls 2019-11-12
17:20:17.199771714 +0100
@@ -1,33 +1,31 @@
{%- from "hana/map.jinja" import hana with context -%}
{% set host = grains['host'] %}
-{% for node in hana.nodes %}
-{% if node.host == host and node.primary is defined %}
+{% for node in hana.nodes if node.host == host and node.primary is defined %}
-{{ node.primary.name }}:
+{{ node.primary.name }}:
hana.sr_primary_enabled:
- - sid: {{ node.sid }}
- - inst: {{ node.instance }}
- - password: {{ node.password }}
+ - sid: {{ node.sid }}
+ - inst: {{ node.instance }}
+ - password: {{ node.password }}
{% if node.primary.userkey is defined %}
- userkey:
- - key_name: {{ node.primary.userkey.key_name }}
- - environment: {{ node.primary.userkey.environment }}
- - user_name: {{ node.primary.userkey.user_name }}
- - user_password: {{ node.primary.userkey.user_password }}
- - database: {{ node.primary.userkey.database }}
+ - key_name: {{ node.primary.userkey.key_name }}
+ - environment: {{ node.primary.userkey.environment }}
+ - user_name: {{ node.primary.userkey.user_name }}
+ - user_password: {{ node.primary.userkey.user_password }}
+ - database: {{ node.primary.userkey.database }}
{% endif %}
{% if node.primary.backup is defined %}
- backup:
{% if node.primary.backup.key_name is defined %}
- - key_name: {{ node.primary.backup.key_name }}
+ - key_name: {{ node.primary.backup.key_name }}
{% else %}
- - user_name: {{ node.primary.backup.user_name }}
- - user_password: {{ node.primary.backup.user_password }}
+ - user_name: {{ node.primary.backup.user_name }}
+ - user_password: {{ node.primary.backup.user_password }}
{% endif %}
- - database: {{ node.primary.backup.database }}
- - file: {{ node.primary.backup.file }}
+ - database: {{ node.primary.backup.database }}
+ - file: {{ node.primary.backup.file }}
{% endif %}
-{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/hana/enable_secondary.sls
new/saphanabootstrap-formula-0.3.2/hana/enable_secondary.sls
--- old/saphanabootstrap-formula-0.2.5/hana/enable_secondary.sls
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/enable_secondary.sls
2019-11-12 17:20:17.199771714 +0100
@@ -1,27 +1,25 @@
{%- from "hana/map.jinja" import hana with context -%}
{% set host = grains['host'] %}
-{% for node in hana.nodes %}
-{% if node.host == host and node.secondary is defined %}
+{% 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 %}
-{{ node.secondary.name }}:
+{{ node.secondary.name }}:
hana.sr_secondary_registered:
- - sid: {{ node.sid }}
- - inst: {{ node.instance }}
- - password: {{ node.password }}
- - remote_host: {{ node.secondary.remote_host }}
- - remote_instance: {{ node.secondary.remote_instance }}
- - replication_mode: {{ node.secondary.replication_mode }}
- - operation_mode: {{ node.secondary.operation_mode }}
+ - sid: {{ node.sid }}
+ - inst: {{ node.instance }}
+ - password: {{ node.password }}
+ - remote_host: {{ node.secondary.remote_host }}
+ - remote_instance: {{ node.secondary.remote_instance }}
+ - replication_mode: {{ node.secondary.replication_mode }}
+ - operation_mode: {{ node.secondary.operation_mode }}
- timeout: {{ node.secondary.primary_timeout|default(100) }}
- interval: {{ node.secondary.interval|default(10) }}
- primary_pass: {{ primary_pass }}
{% endif %}
{% endfor %}
-{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.5/hana/install.sls
new/saphanabootstrap-formula-0.3.2/hana/install.sls
--- old/saphanabootstrap-formula-0.2.5/hana/install.sls 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/install.sls 2019-11-12
17:20:17.199771714 +0100
@@ -4,8 +4,7 @@
include:
- .enable_cost_optimized
-{% for node in hana.nodes %}
-{% if node.host == host and node.install is defined %}
+{% for node in hana.nodes if node.host == host and node.install is defined %}
hana_install_{{ node.host+node.sid }}:
hana.installed:
@@ -29,5 +28,4 @@
{% endfor %}
{% endif %}
-{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.5/hana/packages.sls
new/saphanabootstrap-formula-0.3.2/hana/packages.sls
--- old/saphanabootstrap-formula-0.2.5/hana/packages.sls 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/packages.sls 2019-11-12
17:20:17.199771714 +0100
@@ -6,7 +6,8 @@
{% endif %}
{% if pattern_available == 0 %}
-{% set repo =
salt['pkg.info_available']('patterns-sap-hana')['patterns-sap-hana']['repository']
%}
+# refresh is disabled to avoid errors during the call
+{% set repo = salt['pkg.info_available']('patterns-sap-hana',
refresh=False)['patterns-sap-hana']['repository'] %}
patterns-sap-hana:
pkg.installed:
- fromrepo: {{ repo }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/hana/pre_validation.sls
new/saphanabootstrap-formula-0.3.2/hana/pre_validation.sls
--- old/saphanabootstrap-formula-0.2.5/hana/pre_validation.sls 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/hana/pre_validation.sls 2019-11-12
17:20:17.199771714 +0100
@@ -2,10 +2,9 @@
{% set host = grains['host'] %}
-{% for node in hana.nodes %}
- {% if node.host == host %}
+{% for node in hana.nodes if node.host == host %}
- {# Check HANA insatll checkbox #}
+ {# Check HANA install checkbox #}
{% if node.install_checkbox is defined and node.install_checkbox == false %}
{% do node.pop('install') %}
@@ -23,9 +22,15 @@
{% do node.install.update({'extra_parameters': new_extra_parameters}) %}
{% endif %}
{% endif %}
- {# Check HANA insatll checkbox finish #}
+ {# Check HANA install checkbox finish #}
- {# Check HANA Systen replication mode #}
+ {# Check HANA Scenario type #}
+ {% if node.scenario_type is defined and node.scenario_type !=
"cost-optimized" %}
+ {% do node.pop('cost_optimized_parameters') %}
+ {% endif %}
+ {# Check HANA Scenario type finish #}
+
+ {# Check HANA System replication mode #}
{% if node.system_replication is defined %}
{% if node.system_replication.system_replication_options is defined and
node.system_replication.system_replication_options != "Secondary" %}
{% do node.pop('secondary') %}
@@ -43,12 +48,12 @@
{% endif %}
{% endif %}
- {# Check HANA Systen replication mode finish #}
+ {# Check HANA System replication mode finish #}
+
{# Check HANA exporter #}
- {% if node.add_exporter is defined and node.add_exporter == false%}
+ {% if node.add_exporter is defined and node.add_exporter == false %}
{% do node.pop('exporter') %}
{% endif %}
{# Check HANA exporter finish #}
- {% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/saphanabootstrap-formula-0.2.5/pillar.example
new/saphanabootstrap-formula-0.3.2/pillar.example
--- old/saphanabootstrap-formula-0.2.5/pillar.example 2019-07-10
15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/pillar.example 2019-11-12
17:20:17.199771714 +0100
@@ -33,8 +33,11 @@
# Optional: Add hanadb_exporter to the instance
exporter:
exposition_port: 8001 # Optional, 8001 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'
+ #port: 30015 # HANA database port. If multi_tenant is set this value
is 3XX13 by default where XX is the instance number
+ timeout: 600 # Timeout in seconds to start the connection with HANA
database
- host: 'hana02'
sid: 'prd'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.3.2/saphanabootstrap-formula.changes
--- old/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.changes
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/saphanabootstrap-formula.changes
2019-11-12 17:20:17.199771714 +0100
@@ -1,4 +1,59 @@
-------------------------------------------------------------------
+Wed Oct 30 16:14:32 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.2
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas (0755, root, salt)
+ (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
+
+-------------------------------------------------------------------
+Fri Oct 25 07:22:15 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.3.0
+ * Add support for multi tenant hanadb_exporter
+
+-------------------------------------------------------------------
+Wed Sep 4 06:55:01 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Update the pkg.info_available call to avoid repositories refresh as
+ it may cause errors
+
+-------------------------------------------------------------------
+Wed Aug 7 07:46:25 UTC 2019 - Simranpal Singh <[email protected]>
+
+- Version bump 0.2.9
+ * Fix srHook script usage for cost optimized scenario
+ * Add scenario type options to the form.yml file
+ (boo#1137989)
+
+-------------------------------------------------------------------
+Wed Jul 31 12:26:05 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Fix errors in the form.yml file to match with the formula names
+- Fix some styling issues
+
+-------------------------------------------------------------------
+Tue Jul 23 11:17:36 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.8
+ * Add support for Power machines
+ * Fix issues with SAP HANA deployment template and the exporter
+
+-------------------------------------------------------------------
+Mon Jul 22 08:26:16 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
+
+- Version bump 0.2.7
+ * Fix issue with file permissions during package installation in
+ /usr/share/salt-formulas
+ (boo#1142306)
+
+-------------------------------------------------------------------
Mon Jul 8 11:49:55 UTC 2019 - Dario Maiocchi <[email protected]>
- Version bump 0.2.6
@@ -8,9 +63,9 @@
-------------------------------------------------------------------
Wed Jul 3 07:58:55 UTC 2019 - Xabier Arbulu Insausti <[email protected]>
-- Version bump 0.2.5
+- Version bump 0.2.5
* hanadb_exporter executed as a daemon
- * hanadb_exporter installation suggested
+ * hanadb_exporter installation suggested
-------------------------------------------------------------------
Tue Jul 2 11:14:50 UTC 2019 - Diego Vinicius Akechi <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.spec
new/saphanabootstrap-formula-0.3.2/saphanabootstrap-formula.spec
--- old/saphanabootstrap-formula-0.2.5/saphanabootstrap-formula.spec
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/saphanabootstrap-formula.spec
2019-11-12 17:20:17.199771714 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.2.5
+Version: 0.3.2
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
@@ -30,12 +30,8 @@
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)
-Requires: salt-standalone-formulas-configuration
-%endif
+Requires: salt-formulas-configuration
+Suggests: hanadb_exporter >= 0.5.0
%define fname hana
%define fdir %{_datadir}/salt-formulas
@@ -54,16 +50,6 @@
%install
-# before SUMA 4.0/15-SP1, install on the standard Salt Location.
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
-
-mkdir -p %{buildroot}/srv/salt/
-cp -R %{fname} %{buildroot}/srv/salt/
-cp -R %{ftemplates} %{buildroot}/srv/salt/%{fname}/
-
-%else
-
-# On SUMA 4.0/15-SP1, a single shared directory will be used.
mkdir -p %{buildroot}%{fdir}/states/%{fname}
mkdir -p %{buildroot}%{fdir}/metadata/%{fname}
cp -R %{fname} %{buildroot}%{fdir}/states
@@ -74,9 +60,7 @@
cp -R metadata.yml %{buildroot}%{fdir}/metadata/%{fname}
fi
-%endif
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150100
%files
%defattr(-,root,root,-)
%if 0%{?sle_version} < 120300
@@ -85,28 +69,13 @@
%doc README.md
%license LICENSE
%endif
-/srv/salt/%{fname}
-/srv/salt/%{fname}/%{ftemplates}
-
-%dir %attr(0755, root, salt) /srv/salt
-%else
-
-%files
-%defattr(-,root,root,-)
-%doc README.md
-%license LICENSE
-%dir %{fdir}
-%dir %{fdir}/states
-%dir %{fdir}/metadata
-%{fdir}/states/%{fname}
-%{fdir}/states/%{fname}/%{ftemplates}
-%{fdir}/metadata/%{fname}
-
-%dir %attr(0750, root, salt) %{fdir}
-%dir %attr(0750, root, salt) %{fdir}/states
-%dir %attr(0750, root, salt) %{fdir}/metadata
-
-%endif
+%dir %attr(0755, root, salt) %{fdir}
+%dir %attr(0755, root, salt) %{fdir}/states
+%dir %attr(0755, root, salt) %{fdir}/metadata
+
+%attr(0755, root, salt) %{fdir}/states/%{fname}
+%attr(0755, root, salt) %{fdir}/states/%{fname}/%{ftemplates}
+%attr(0755, root, salt) %{fdir}/metadata/%{fname}
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/templates/hanadb_exporter.j2
new/saphanabootstrap-formula-0.3.2/templates/hanadb_exporter.j2
--- old/saphanabootstrap-formula-0.2.5/templates/hanadb_exporter.j2
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/templates/hanadb_exporter.j2
2019-11-12 17:20:17.199771714 +0100
@@ -9,9 +9,15 @@
{
"exposition_port": {{ node.exporter.exposition_port|default(8001) }},
+ "multi_tenant": {{ node.exporter.multi_tenant|default(true)|tojson }},
+ "timeout": {{node.exporter.timeout|default(600)}},
"hana": {
"host": "{{ node.host }}",
- "port": 3{{ dbinst }}15,
+ {% if node.exporter.multi_tenant|default(true) is sameas true and
node.exporter.port is not defined %}
+ "port": 3{{ dbinst }}13,
+ {% else %}
+ "port": {{ node.exporter.port }},
+ {% endif %}
"user": "{{ node.exporter.user }}",
"password": "{{ node.exporter.password }}"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.2.5/templates/srTakeover_hook.j2
new/saphanabootstrap-formula-0.3.2/templates/srTakeover_hook.j2
--- old/saphanabootstrap-formula-0.2.5/templates/srTakeover_hook.j2
2019-07-10 15:08:23.171420508 +0200
+++ new/saphanabootstrap-formula-0.3.2/templates/srTakeover_hook.j2
2019-11-12 17:20:17.199771714 +0100
@@ -1,3 +1,4 @@
+#!/usr/bin/env python2
{%- from "hana/map.jinja" import hana with context -%}
{% set host = grains['host'] %}
@@ -29,7 +30,6 @@
{% endif %}
{% endfor %}
-#!/usr/bin/env python2
"""
Auto-generated HA/DR hook script
