Hello community,
here is the log from the commit of package saphanabootstrap-formula for
openSUSE:Factory checked in at 2020-11-19 11:59:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula"
Thu Nov 19 11:59:42 2020 rev:25 rq:849194 version:0.6.2+git.1605666876.936dd43
Changes:
--------
---
/work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes
2020-10-20 16:22:55.250365242 +0200
+++
/work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.5913/saphanabootstrap-formula.changes
2020-11-23 10:49:43.186556022 +0100
@@ -1,0 +2,5 @@
+Wed Nov 11 04:25:03 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
+
+- Add support to extract and install HANA Client sar packages
+
+-------------------------------------------------------------------
Old:
----
saphanabootstrap-formula-0.6.2+git.1603119080.710767e.tar.gz
New:
----
saphanabootstrap-formula-0.6.2+git.1605666876.936dd43.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ saphanabootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.BbEPVU/_old 2020-11-23 10:49:43.686556522 +0100
+++ /var/tmp/diff_new_pack.BbEPVU/_new 2020-11-23 10:49:43.690556527 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: saphanabootstrap-formula
-Version: 0.6.2+git.1603119080.710767e
+Version: 0.6.2+git.1605666876.936dd43
Release: 0
Summary: SAP HANA platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.BbEPVU/_old 2020-11-23 10:49:43.718556554 +0100
+++ /var/tmp/diff_new_pack.BbEPVU/_new 2020-11-23 10:49:43.722556559 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">saphanabootstrap-formula</param>
<param name="versionformat">0.6.2+git.%ct.%h</param>
- <param name="revision">710767ee1d96d826860c2cdf38a4f2ea6533671e</param>
+ <param name="revision">936dd43b30402418cf272c98186264c056e1d2ed</param>
</service>
<service name="recompress" mode="disabled">
++++++ saphanabootstrap-formula-0.6.2+git.1603119080.710767e.tar.gz ->
saphanabootstrap-formula-0.6.2+git.1605666876.936dd43.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/defaults.yaml
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/defaults.yaml
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/defaults.yaml
2020-10-19 16:51:20.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/defaults.yaml
2020-11-18 03:34:36.000000000 +0100
@@ -2,5 +2,6 @@
install_packages: true
ha_enabled: true
hana_extract_dir: /sapmedia_extract/HANA
+ hana_client_extract_dir: /sapmedia_extract/HANA_CLIENT
nodes: []
monitoring_enabled: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/enable_cost_optimized.sls
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/enable_cost_optimized.sls
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/enable_cost_optimized.sls
2020-10-19 16:51:20.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/enable_cost_optimized.sls
2020-11-18 03:34:36.000000000 +0100
@@ -1,6 +1,6 @@
{%- from "hana/map.jinja" import hana with context -%}
-{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
-{% set hana_extract_dir = get_hana_exe_extract_dir(hana) %}
+{%- from 'hana/macros/get_hana_client_path.sls' import get_hana_client_path
with context %}
+{%- set hana_client_path = get_hana_client_path(hana) %}
{% set host = grains['host'] %}
@@ -56,7 +56,7 @@
extract_hana_pydbapi_archive:
hana.pydbapi_extracted:
- name: PYDBAPI.TGZ
- - software_folders: [{{
node.install.software_path|default(hana.software_path)|default(hana_extract_dir)
}}]
+ - software_folders: [{{
node.install.software_path|default(hana.software_path)|default(hana_client_path)
}}]
- output_dir: /hana/shared/srHook
- hana_version: '20'
- force: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/extract_hana_package.sls
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/extract_hana_package.sls
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/extract_hana_package.sls
2020-10-19 16:51:20.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/extract_hana_package.sls
2020-11-18 03:34:36.000000000 +0100
@@ -51,5 +51,14 @@
- require:
- extract_hdbserver_sar_archive
+{%- if hana.hana_client_archive_file is defined and
hana.hana_client_archive_file.endswith((".sar", ".SAR")) %}
+extract_hana_client_sar_archive:
+ sapcar.extracted:
+ - name: {{ hana.hana_client_archive_file }}
+ - sapcar_exe: {{ hana.sapcar_exe_file }}
+ - output_dir: {{ hana.hana_client_extract_dir }}
+ - options: "-manifest SIGNATURE.SMF"
+{% endif %}
+
{%- endif %}
{%- endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/macros/get_hana_client_path.sls
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/macros/get_hana_client_path.sls
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/macros/get_hana_client_path.sls
1970-01-01 01:00:00.000000000 +0100
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/macros/get_hana_client_path.sls
2020-11-18 03:34:36.000000000 +0100
@@ -0,0 +1,13 @@
+{% macro get_hana_client_path(hana) -%}
+{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
+ {#- If hana archive used for installation is sar format, it will not
contain the hana client, so we need to provide a hana client #}
+ {#- One of the following paths is used for hana client based on pillar
entries: 1. hana_client_software_path 2. hana_client_extract_dir 3.
hana_extract_dir #}
+ {%- if hana.hana_client_software_path is defined %}
+ {%- set hana_client_path = hana.hana_client_software_path %}
+ {%- elif hana.hana_client_archive_file is defined and
hana.hana_archive_file is defined and hana.hana_archive_file.endswith((".sar",
".SAR")) %}
+ {%- set hana_client_path = hana.hana_client_extract_dir %}
+ {%- else %}
+ {%- set hana_client_path = get_hana_exe_extract_dir(hana) %}
+ {%- endif %}
+{{- hana_client_path }}
+{%- endmacro %}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/monitoring.sls
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/monitoring.sls
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/hana/monitoring.sls
2020-10-19 16:51:20.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/hana/monitoring.sls
2020-11-18 03:34:36.000000000 +0100
@@ -1,6 +1,6 @@
{%- from "hana/map.jinja" import hana with context -%}
-{%- from 'hana/macros/get_hana_exe_extract_dir.sls' import
get_hana_exe_extract_dir with context %}
-{% set hana_extract_dir = get_hana_exe_extract_dir(hana) %}
+{%- from 'hana/macros/get_hana_client_path.sls' import get_hana_client_path
with context %}
+{%- set hana_client_path = get_hana_client_path(hana) %}
{% set pydbapi_output_dir = '/tmp/pydbapi' %}
@@ -31,7 +31,7 @@
extract_pydbapi_client:
hana.pydbapi_extracted:
- name: PYDBAPI.TGZ
- - software_folders: [{{
exporter.hana_client_path|default(node.install.software_path)|default(hana.software_path)|default(hana_extract_dir)
}}]
+ - software_folders: [{{
node.install.software_path|default(hana.software_path)|default(hana_client_path)
}}]
- output_dir: {{ pydbapi_output_dir }}
- hana_version: '20'
- force: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/pillar.example
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/pillar.example
--- old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/pillar.example
2020-10-19 16:51:20.000000000 +0200
+++ new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/pillar.example
2020-11-18 03:34:36.000000000 +0100
@@ -9,15 +9,25 @@
# Warning: only a unique solution can exist into a node.
saptune_solution: 'HANA'
- # Specify the path to already extracted HANA platform installation media
- # This will have preference over hana installation media archive
+ # HANA installation media can be provided in one of the two methods:
extracted HANA platform folder or HANA media archive
+ # 1. Path to already extracted HANA platform installation media. This will
have preference over hana installation media archive
software_path: '/sapmedia/HANA/51052481'
- # Or specify the path to the hana installation media archive
+ # 2. Or specify the path to the hana installation media archive
# If using hana sar archive, please also provide compatible version of
sapcar executable
# The archive will be extracted to path specified at hana_extract_dir
(optional, by default /sapmedia_extract/HANA)
# hana_extract_dir should be a new directory and seperate from location
where the compressed files are present, to avoid conflicts in file permissions.
hana_archive_file: '/sapmedia/51053492.ZIP'
hana_extract_dir: '/sapmedia_extract/HANA'
+
+ # HANA Client packages are needed for monitoring & cost-optimized scenario.
HANA Client is already included in HANA platform media unless a HANA database
sar archive is used
+ # If the HANA archive used for installation is sar format specified above,
you need to provide HANA Client in one of the two ways: extracted HANA client
folder or HANA client sar archive file
+ # 1. Path to already extracted hana client folder
+ #hana_client_software_path: '/sapmedia/IMDB_CLIENT'
+ # 2. Or specify the path to the hana client sar archive file. It will be
extracted to hana_client_extract_dir path (optional, by default
/sapmedia_extract/HANA_CLIENT)
+ hana_client_archive_file: '/sapmedia/IMDB_CLIENT20_003_144-80002090.SAR'
+ hana_client_extract_dir: '/sapmedia_extract/HANA_CLIENT'
+
+ #If using a sar archive for hana platform or hana client media, please
provide compatible version of sapcar executable
#sapcar_exe_file: '/sapmedia/SAPCAR'
# Enable HA cluster configuration. It installs the SAPHanaSR hook.
@@ -38,7 +48,7 @@
# Specify the path to local installation media here, otherwise global
variable software_path will be used for installation media.
# If both of these paths are not set, hana_extract_dir path will be
used for installation media,
# given that hana_archive_file package is also provided
- software_path: '/sapmedia/HANA/51052481'
+ #software_path: '/sapmedia/HANA/51052481'
root_user: 'root'
root_password: 's'
# Fetch HANA passwords from XML file
@@ -71,8 +81,6 @@
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
- # Set the path of the HANA Client folder, if it is not set, the node
software_path will be used
- #hana_client_path: /hana_client_path
- host: 'hana02'
sid: 'prd'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/saphanabootstrap-formula.changes
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/saphanabootstrap-formula.changes
---
old/saphanabootstrap-formula-0.6.2+git.1603119080.710767e/saphanabootstrap-formula.changes
2020-10-19 16:51:20.000000000 +0200
+++
new/saphanabootstrap-formula-0.6.2+git.1605666876.936dd43/saphanabootstrap-formula.changes
2020-11-18 03:34:36.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Nov 11 04:25:03 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com>
+
+- Add support to extract and install HANA Client sar packages
+
+-------------------------------------------------------------------
Mon Oct 19 14:48:50 UTC 2020 - Xabier Arbulu <xarb...@suse.com>
- Set the native fence mechanism usage for CSP as optional
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
