Hello community, here is the log from the commit of package saphanabootstrap-formula for openSUSE:Factory checked in at 2020-06-17 14:53:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saphanabootstrap-formula (Old) and /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saphanabootstrap-formula" Wed Jun 17 14:53:45 2020 rev:14 rq:815313 version:0.5.10+git.1592336558.a91501a Changes: -------- --- /work/SRC/openSUSE:Factory/saphanabootstrap-formula/saphanabootstrap-formula.changes 2020-06-09 00:08:09.238033502 +0200 +++ /work/SRC/openSUSE:Factory/.saphanabootstrap-formula.new.3606/saphanabootstrap-formula.changes 2020-06-17 14:54:43.449882407 +0200 @@ -1,0 +2,7 @@ +Wed Jun 10 01:49:02 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com> + +- Add support to extract zip,rar,exe,sar hana media +- This change brings non backward compatible changes. The variable + hdbserver_extract_dir is replaced by hana_extract_dir + +------------------------------------------------------------------- Old: ---- saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b.tar.gz New: ---- saphanabootstrap-formula-0.5.10+git.1592336558.a91501a.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saphanabootstrap-formula.spec ++++++ --- /var/tmp/diff_new_pack.hSvbwD/_old 2020-06-17 14:54:44.269885214 +0200 +++ /var/tmp/diff_new_pack.hSvbwD/_new 2020-06-17 14:54:44.269885214 +0200 @@ -19,7 +19,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: saphanabootstrap-formula -Version: 0.5.10+git.1591606061.233ca8b +Version: 0.5.10+git.1592336558.a91501a Release: 0 Summary: SAP HANA platform deployment formula License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hSvbwD/_old 2020-06-17 14:54:44.309885352 +0200 +++ /var/tmp/diff_new_pack.hSvbwD/_new 2020-06-17 14:54:44.309885352 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="filename">saphanabootstrap-formula</param> <param name="versionformat">0.5.10+git.%ct.%h</param> - <param name="revision">233ca8b0231b85cf4e09ae0db70b9d82430da313</param> + <param name="revision">a91501a7f3788ead3e816be3fec727e80ee42b61</param> </service> <service name="recompress" mode="disabled"> ++++++ saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b.tar.gz -> saphanabootstrap-formula-0.5.10+git.1592336558.a91501a.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/defaults.yaml new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/defaults.yaml --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/defaults.yaml 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/defaults.yaml 2020-06-16 21:42:38.000000000 +0200 @@ -1,6 +1,6 @@ hana: install_packages: true ha_enabled: true - hdbserver_extract_dir: /sapmedia/HANA + hana_extract_dir: /sapmedia/HANA nodes: [] monitoring_enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/enable_cost_optimized.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/enable_cost_optimized.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/enable_cost_optimized.sls 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/enable_cost_optimized.sls 2020-06-16 21:42:38.000000000 +0200 @@ -1,4 +1,6 @@ {%- from "hana/map.jinja" import hana with context -%} +{%- from "hana/extract_hana_package.sls" import hana_extract_dir with context -%} + {% set host = grains['host'] %} {% for node in hana.nodes %} @@ -53,7 +55,7 @@ extract_hana_pydbapi_archive: hana.pydbapi_extracted: - name: PYDBAPI.TGZ - - software_folders: [{{ node.install.software_path|default(hana.software_path) }}] + - software_folders: [{{ node.install.software_path|default(hana.software_path)|default(hana_extract_dir) }}] - output_dir: /hana/shared/srHook - hana_version: '20' - force: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/extract_hana_package.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/extract_hana_package.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/extract_hana_package.sls 1970-01-01 01:00:00.000000000 +0100 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/extract_hana_package.sls 2020-06-16 21:42:38.000000000 +0200 @@ -0,0 +1,60 @@ +{%- from "hana/map.jinja" import hana with context -%} + +{%- if hana.hana_archive_file is defined %} +{% set hana_package = hana.hana_archive_file %} +{% set hana_extract_dir = hana.hana_extract_dir %} + +setup_hana_extract_directory: + file.directory: + - name: {{ hana_extract_dir }} + - mode: 755 + - makedirs: True + +{%- if hana_package.endswith((".ZIP", ".zip", ".RAR", ".rar")) %} + +extract_hana_archive: + archive.extracted: + - name: {{ hana_extract_dir }} + - enforce_toplevel: False + - source: {{ hana_package }} + +{%- elif hana_package.endswith((".exe", ".EXE")) %} + +{% set unrar_package = 'unrar_wrapper' if grains['osrelease_info'][0] == 15 else 'unrar' %} +install_unrar_package: + pkg.installed: + - name: {{ unrar_package }} + +extract_hana_multipart_archive: + cmd.run: + - name: unrar x {{ hana_package }} + - cwd: {{ hana_extract_dir }} + - require: + - install_unrar_package + +{# Below is temporary workaround to update the extraction path when using unrar for multipart rar archive#} +{# TODO: Find better solution to set or detect the correct extraction path when extracting multipart rar archive#} +{% set archive_base_name = salt['file.basename'](hana_package.split('.')[0]) %} +{% set archive_name = archive_base_name.split('_')[0] %} +{% set hana_extract_dir = hana_extract_dir| path_join(archive_name) %} + +{%- elif hana_package.endswith((".sar", ".SAR")) and hana.sapcar_exe_file is defined %} + +extract_hdbserver_sar_archive: + sapcar.extracted: + - name: {{ hana_package }} + - sapcar_exe: {{ hana.sapcar_exe_file }} + - output_dir: {{ hana_extract_dir }} + - options: "-manifest SIGNATURE.SMF" + +copy_signature_file_to_installer_dir: + file.copy: + - source: {{ hana_extract_dir }}/SIGNATURE.SMF + - name: {{ hana_extract_dir }}/SAP_HANA_DATABASE/SIGNATURE.SMF + - preserve: True + - force: True + - require: + - extract_hdbserver_sar_archive + +{%- endif %} +{%- endif %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/extract_hdbserver.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/extract_hdbserver.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/extract_hdbserver.sls 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/extract_hdbserver.sls 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -{%- from "hana/map.jinja" import hana with context -%} - -{% if hana.hdbserver_sar_file is defined and hana.sapcar_exe_file is defined %} - -extract_hdbserver_sar: - sapcar.extracted: - - name: {{ hana.hdbserver_sar_file }} - - sapcar_exe: {{ hana.sapcar_exe_file }} - - output_dir: {{ hana.hdbserver_extract_dir }} - - options: "-manifest SIGNATURE.SMF" - -copy_signature_file_to_installer_dir: - file.copy: - - source: {{ hana.hdbserver_extract_dir }}/SIGNATURE.SMF - - name: {{ hana.hdbserver_extract_dir }}/SAP_HANA_DATABASE/SIGNATURE.SMF - - preserve: True - - force: True - - require: - - extract_hdbserver_sar - -{% endif %} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/init.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/init.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/init.sls 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/init.sls 2020-06-16 21:42:38.000000000 +0200 @@ -6,7 +6,7 @@ {% endif %} - hana.pre_validation - hana.saptune - - hana.extract_hdbserver + - hana.extract_hana_package - hana.install - hana.enable_primary - hana.enable_secondary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/install.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/install.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/install.sls 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/install.sls 2020-06-16 21:42:38.000000000 +0200 @@ -1,4 +1,5 @@ {%- from "hana/map.jinja" import hana with context -%} +{%- from "hana/extract_hana_package.sls" import hana_extract_dir with context -%} {% set host = grains['host'] %} include: @@ -11,7 +12,7 @@ - name: {{ node.sid }} - inst: {{ node.instance }} - password: {{ node.password }} - - software_path: {{ node.install.software_path|default(hana.software_path)|default(hana.hdbserver_extract_dir) }} + - software_path: {{ node.install.software_path|default(hana.software_path)|default(hana_extract_dir) }} - root_user: {{ node.install.root_user }} - root_password: {{ node.install.root_password }} {% if node.install.config_file is defined %} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/monitoring.sls new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/monitoring.sls --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/hana/monitoring.sls 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/hana/monitoring.sls 2020-06-16 21:42:38.000000000 +0200 @@ -1,4 +1,5 @@ {%- from "hana/map.jinja" import hana with context -%} +{%- from "hana/extract_hana_package.sls" import hana_extract_dir with context -%} {% set pydbapi_output_dir = '/tmp/pydbapi' %} @@ -29,7 +30,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) }}] + - software_folders: [{{ exporter.hana_client_path|default(node.install.software_path)|default(hana.software_path)|default(hana_extract_dir) }}] - output_dir: {{ pydbapi_output_dir }} - hana_version: '20' - force: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/pillar.example new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/pillar.example --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/pillar.example 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/pillar.example 2020-06-16 21:42:38.000000000 +0200 @@ -10,14 +10,14 @@ saptune_solution: 'HANA' # Specify the path to already extracted HANA platform installation media - # This will have preference over hdbserver sar archive installation media + # This will have preference over hana installation media archive software_path: '/sapmedia/HANA/51052481' - # Or specify the path to the sapcar executable & HANA database server installation sar archive - # The sar archive will be extracted to path specified at hdbserver_extract_dir (optional, by default /sapmedia/HANA) - # Make sure to use the latest/compatible version of sapcar executable, otherwise file may be extracted incorrectly - sapcar_exe_file: '/sapmedia/sapcar.exe' - hdbserver_sar_file: '/sapmedia/IMDB_SERVER_LINUX.SAR' - hdbserver_extract_dir: '/sapmedia/HANA' + # 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/HANA) + hana_archive_file: '/sapmedia/51053492.ZIP' + hana_extract_dir: '/sapmedia/HANA' + #sapcar_exe_file: '/sapmedia/SAPCAR' # Enable HA cluster configuration. It installs the SAPHanaSR hook. # To use this option the primary and secondary nodes must be defined in the pillar file @@ -34,9 +34,9 @@ instance: 00 password: 'Qwerty1234' install: - # 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, hdbserver_extract_dir path will be used for installation media, - # given that sapcar_exe_file & hdbserver_sar_file package is also provided + # 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' root_user: 'root' root_password: 's' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/saphanabootstrap-formula.changes new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/saphanabootstrap-formula.changes --- old/saphanabootstrap-formula-0.5.10+git.1591606061.233ca8b/saphanabootstrap-formula.changes 2020-06-08 10:47:41.000000000 +0200 +++ new/saphanabootstrap-formula-0.5.10+git.1592336558.a91501a/saphanabootstrap-formula.changes 2020-06-16 21:42:38.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 10 01:49:02 UTC 2020 - Simranpal Singh <simranpal.si...@suse.com> + +- Add support to extract zip,rar,exe,sar hana media +- This change brings non backward compatible changes. The variable + hdbserver_extract_dir is replaced by hana_extract_dir + +------------------------------------------------------------------- Fri Jun 5 14:42:12 UTC 2020 - Stefano Torresi <stefano.torr...@suse.com> - Fix provisioning of hanadb_exporter in SLE12, where python3-pip must be always installed.