Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2020-07-07 13:00:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Tue Jul 7 13:00:54 2020 rev:11 rq:819051 version:0.4.4+git.1594058536.82f1049
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2020-06-04 20:57:57.951315637 +0200
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.3060/sapnwbootstrap-formula.changes
2020-07-07 13:01:29.122339710 +0200
@@ -1,0 +2,8 @@
+Thu May 28 22:00:38 UTC 2020 - Simranpal Singh <[email protected]>
+
+- Version 0.5.0
+ * Add support to extract nw media archives
+ * This change brings non backward compatible changes. Remove default swpm
installer extract directory and
+ add nw_extract_dir variable to store all extracted NW media
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.4.4+git.1591284148.611687e.tar.gz
New:
----
sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.Zh4Ey7/_old 2020-07-07 13:01:30.486343540 +0200
+++ /var/tmp/diff_new_pack.Zh4Ey7/_new 2020-07-07 13:01:30.490343551 +0200
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.4.4+git.1591284148.611687e
+Version: 0.4.4+git.1594058536.82f1049
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Zh4Ey7/_old 2020-07-07 13:01:30.542343697 +0200
+++ /var/tmp/diff_new_pack.Zh4Ey7/_new 2020-07-07 13:01:30.546343709 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
<param name="versionformat">0.4.4+git.%ct.%h</param>
- <param name="revision">611687eb99ad67f2ad97dc91f723d874510a24fb</param>
+ <param name="revision">82f104952d812f4413920b8e38e63a95fc8984c5</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.4.4+git.1591284148.611687e.tar.gz ->
sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/.travis.yml
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/.travis.yml
--- old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/.travis.yml
2020-06-04 17:22:28.000000000 +0200
+++ new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/.travis.yml
2020-07-06 20:02:16.000000000 +0200
@@ -5,8 +5,8 @@
addons:
apt:
sources:
- - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest trusty main'
- key_url:
'https://repo.saltstack.com/apt/ubuntu/14.04/amd64/latest/SALTSTACK-GPG-KEY.pub'
+ - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2019.2/ bionic main'
+ key_url:
'http://repo.saltstack.com/apt/ubuntu/18.04/amd64/2019.2/SALTSTACK-GPG-KEY.pub'
packages:
- salt-common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/defaults.yaml
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/defaults.yaml
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/defaults.yaml
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/defaults.yaml
2020-07-06 20:02:16.000000000 +0200
@@ -2,7 +2,7 @@
install_packages: true
clean_nfs: True
installation_folder: /tmp/swpm_unattended
- swpm_extract_dir: /sapmedia/NW/SWPM
+ nw_extract_dir: /sapmedia/NW
additional_dvds: []
ha_enabled: True
nfs_version: nfs4 # Used to connect to the nfs share
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/extract_installer.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/extract_installer.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/extract_installer.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/extract_installer.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-{%- from "netweaver/map.jinja" import netweaver with context -%}
-
-{% if netweaver.sapcar_exe_file is defined and netweaver.swpm_sar_file is
defined %}
-
-extract_installer_file:
- sapcar.extracted:
- - name: {{ netweaver.swpm_sar_file }}
- - sapcar_exe: {{ netweaver.sapcar_exe_file }}
- - output_dir: {{ netweaver.swpm_extract_dir }}
- - options: "-manifest SIGNATURE.SMF"
-
-{% endif %}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/extract_nw_archives.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/extract_nw_archives.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/extract_nw_archives.sls
1970-01-01 01:00:00.000000000 +0100
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/extract_nw_archives.sls
2020-07-06 20:02:16.000000000 +0200
@@ -0,0 +1,76 @@
+{%- from "netweaver/map.jinja" import netweaver with context -%}
+{% set nw_extract_dir = netweaver.nw_extract_dir %}
+{% set swpm_extract_dir = nw_extract_dir| path_join('SWPM') %}
+
+setup_nw_extract_directory:
+ file.directory:
+ - name: {{ nw_extract_dir }}
+ - mode: 755
+ - makedirs: True
+
+{# Install unrar tool needed for extracting multipart archives, based on SLES
version #}
+{% set unrar_package = 'unrar_wrapper' if grains['osrelease_info'][0] == 15
else 'unrar' %}
+install_unrar_package:
+ pkg.installed:
+ - name: {{ unrar_package }}
+
+{% if netweaver.sapcar_exe_file is defined and netweaver.swpm_sar_file is
defined %}
+
+extract_installer_file:
+ sapcar.extracted:
+ - name: {{ netweaver.swpm_sar_file }}
+ - sapcar_exe: {{ netweaver.sapcar_exe_file }}
+ - output_dir: {{ swpm_extract_dir }}
+ - options: "-manifest SIGNATURE.SMF"
+
+{% endif %}
+
+{% set additional_dvd_folders = [] %}
+
+{% for dvd_entry in netweaver.additional_dvds %}
+
+{# Set the extraction path for various archives in dvds list based on the dvd
extension name #}
+{% set dvd = dvd_entry | string %}
+{% set dvd_folder_name = salt['file.basename'](dvd.split('.')[0]) %}
+{% set dvd_extract_dir = nw_extract_dir | path_join(dvd_folder_name) %}
+
+{# Conditions to extract archives based on extension name #}
+{%- if dvd.endswith((".ZIP", ".zip", ".RAR", ".rar")) %}
+
+extract_nw_archive_{{ dvd }}:
+ archive.extracted:
+ - name: {{ dvd_extract_dir }}
+ - enforce_toplevel: False
+ - source: {{ dvd }}
+
+{% do additional_dvd_folders.append(dvd_extract_dir) %}
+
+{%- elif dvd.endswith((".exe", ".EXE")) %}
+
+extract_nw_multipart_archive_{{ dvd }}:
+ cmd.run:
+ - name: unrar x {{ dvd }}
+ - cwd: {{ nw_extract_dir }}
+ - require:
+ - install_unrar_package
+{# As temporary workaround, the extraction path for multpart archive is
calculated from archive name #}
+{# TODO: Find better solution to set or detect the correct extraction path
when extracting multipart rar archive #}
+{% set exe_dvd_extract_dir = nw_extract_dir |
path_join(dvd_folder_name.split('_')[0]) %}
+{% do additional_dvd_folders.append(exe_dvd_extract_dir) %}
+
+{%- elif dvd.endswith((".sar", ".SAR")) and netweaver.sapcar_exe_file is
defined %}
+
+extract_sar_archive_{{ dvd }}:
+ sapcar.extracted:
+ - name: {{ dvd }}
+ - sapcar_exe: {{ netweaver.sapcar_exe_file }}
+ - output_dir: {{ dvd_extract_dir }}
+ - options: "-manifest SIGNATURE.SMF"
+
+{% do additional_dvd_folders.append(dvd_extract_dir) %}
+
+{%- else %}
+{% do additional_dvd_folders.append(dvd) %}
+
+{%- endif %}
+{%- endfor %}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/init.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/init.sls
--- old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/init.sls
2020-06-04 17:22:28.000000000 +0200
+++ new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/init.sls
2020-07-06 20:02:16.000000000 +0200
@@ -3,7 +3,8 @@
include:
- netweaver.setup
- netweaver.saptune
- - netweaver.extract_installer
+ - netweaver.extract_nw_archives
+ - netweaver.install_pydbapi
- netweaver.install_ascs
- netweaver.install_ers
- netweaver.ha_cluster
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_aas.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_aas.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_aas.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_aas.sls
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,6 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import swpm_extract_dir with
context -%}
{% set host = grains['host'] %}
{% for node in netweaver.nodes if node.host == host and node.sap_instance ==
'aas' %}
@@ -63,7 +65,7 @@
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- - software_path: {{
netweaver.swpm_folder|default(netweaver.swpm_extract_dir) }}
+ - software_path: {{ netweaver.swpm_folder|default(swpm_extract_dir) }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
- config_file: {{ inifile }}
@@ -72,7 +74,7 @@
- virtual_host_mask: {{ node.virtual_host_mask|default(24) }}
- product_id: {{ product_id }}
- cwd: {{ netweaver.installation_folder }}
- - additional_dvds: {{ netweaver.additional_dvds }}
+ - additional_dvds: {{ additional_dvd_folders }}
- require:
- create_aas_inifile_{{ instance_name }}
- wait_for_db_{{ instance_name }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_ascs.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_ascs.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_ascs.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_ascs.sls
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import swpm_extract_dir with
context -%}
+
{% set host = grains['host'] %}
{% for node in netweaver.nodes if node.host == host and node.sap_instance ==
'ascs' %}
@@ -39,7 +42,7 @@
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- - software_path: {{
netweaver.swpm_folder|default(netweaver.swpm_extract_dir) }}
+ - software_path: {{ netweaver.swpm_folder|default(swpm_extract_dir) }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
- config_file: {{ inifile }}
@@ -48,7 +51,7 @@
- virtual_host_mask: {{ node.virtual_host_mask|default(24) }}
- product_id: {{ product_id }}
- cwd: {{ netweaver.installation_folder }}
- - additional_dvds: {{ netweaver.additional_dvds }}
+ - additional_dvds: {{ additional_dvd_folders }}
- require:
- create_ascs_inifile_{{ instance_name }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_db.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_db.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_db.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_db.sls
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import swpm_extract_dir with
context -%}
+
{% set host = grains['host'] %}
{% for node in netweaver.nodes if node.host == host and node.sap_instance ==
'db' %}
@@ -64,7 +67,7 @@
- port: 3{{ hana_instance }}15
- schema_name: {{ netweaver.schema.name|default('SAPABAP1') }}
- schema_password: {{ netweaver.schema.password }}
- - software_path: {{
netweaver.swpm_folder|default(netweaver.swpm_extract_dir) }}
+ - software_path: {{ netweaver.swpm_folder|default(swpm_extract_dir) }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
- config_file: {{ inifile }}
@@ -73,7 +76,7 @@
- virtual_host_mask: {{ node.virtual_host_mask|default(24) }}
- product_id: {{ product_id }}
- cwd: {{ netweaver.installation_folder }}
- - additional_dvds: {{ netweaver.additional_dvds }}
+ - additional_dvds: {{ additional_dvd_folders }}
- require:
- create_db_inifile_{{ instance_name }}
- wait_for_hana_{{ instance_name }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_ers.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_ers.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_ers.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_ers.sls
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import swpm_extract_dir with
context -%}
+
{% set host = grains['host'] %}
{% for node in netweaver.nodes if node.host == host and node.sap_instance ==
'ers' %}
@@ -46,7 +49,7 @@
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- - software_path: {{
netweaver.swpm_folder|default(netweaver.swpm_extract_dir) }}
+ - software_path: {{ netweaver.swpm_folder|default(swpm_extract_dir) }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
- config_file: {{ inifile }}
@@ -55,7 +58,7 @@
- virtual_host_mask: {{ node.virtual_host_mask|default(24) }}
- product_id: {{ product_id }}
- cwd: {{ netweaver.installation_folder }}
- - additional_dvds: {{ netweaver.additional_dvds }}
+ - additional_dvds: {{ additional_dvd_folders }}
- ascs_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- timeout: 1500
- interval: {{ node.interval|default(30) }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_pas.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_pas.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_pas.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_pas.sls
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import swpm_extract_dir with
context -%}
+
{% set host = grains['host'] %}
{% for node in netweaver.nodes if node.host == host and node.sap_instance ==
'pas' %}
@@ -64,7 +67,7 @@
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- - software_path: {{
netweaver.swpm_folder|default(netweaver.swpm_extract_dir) }}
+ - software_path: {{ netweaver.swpm_folder|default(swpm_extract_dir) }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
- config_file: {{ inifile }}
@@ -73,7 +76,7 @@
- virtual_host_mask: {{ node.virtual_host_mask|default(24) }}
- product_id: {{ product_id }}
- cwd: {{ netweaver.installation_folder }}
- - additional_dvds: {{ netweaver.additional_dvds }}
+ - additional_dvds: {{ additional_dvd_folders }}
- require:
- create_pas_inifile_{{ instance_name }}
- wait_for_db_{{ instance_name }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_pydbapi.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_pydbapi.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/install_pydbapi.sls
1970-01-01 01:00:00.000000000 +0100
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/install_pydbapi.sls
2020-07-06 20:02:16.000000000 +0200
@@ -0,0 +1,55 @@
+{%- from "netweaver/map.jinja" import netweaver with context -%}
+{%- from "netweaver/extract_nw_archives.sls" import additional_dvd_folders
with context -%}
+
+{% set host = grains['host'] %}
+
+{% for node in netweaver.nodes if node.host == host and node.sap_instance in
['db', 'pas', 'aas'] %}
+{% if loop.first %}
+{% set pydbapi_output_dir = '/tmp/pydbapi' %}
+nw_install_python_pip:
+ pkg.installed:
+ {% if grains['pythonversion'][0] == 2 %}
+ - name: python-pip
+ {% else %}
+ - name: python3-pip
+ {% endif %}
+ - retry:
+ attempts: 3
+ interval: 15
+ - resolve_capabilities: true
+
+nw_extract_pydbapi_client:
+ hana.pydbapi_extracted:
+ - name: PYDBAPI.TGZ
+ - software_folders: {{ additional_dvd_folders }}
+ - output_dir: {{ pydbapi_output_dir }}
+ - hana_version: '20'
+ - force: true
+
+# pip.installed fails as it cannot manage propler file names with regular
expressions
+# TODO: Improve this to use pip.installed somehow
+nw_install_pydbapi_client:
+ cmd.run:
+ {% if grains['pythonversion'][0] == 2 %}
+ - name: /usr/bin/python -m pip install {{ pydbapi_output_dir
}}/hdbcli-*.tar.gz
+ {% else %}
+ - name: /usr/bin/python3 -m pip install {{ pydbapi_output_dir
}}/hdbcli-*.tar.gz
+ {% endif %}
+ - reload_modules: true
+ - require:
+ - nw_install_python_pip
+ - nw_extract_pydbapi_client
+
+nw_reload_hdb_connector:
+ module.run:
+ - hana.reload_hdb_connector:
+ - require:
+ - nw_install_pydbapi_client
+
+nw_remove_pydbapi_client:
+ file.absent:
+ - name: {{ pydbapi_output_dir }}
+ - onchanges:
+ - nw_extract_pydbapi_client
+{% endif %}
+{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/map.jinja
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/map.jinja
--- old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/map.jinja
2020-06-04 17:22:28.000000000 +0200
+++ new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/map.jinja
2020-07-06 20:02:16.000000000 +0200
@@ -3,4 +3,3 @@
{% import_yaml "netweaver/defaults.yaml" as defaults %}
{% set netweaver = salt['pillar.get']('netweaver', default=defaults.netweaver,
merge=True) %}
-{% do netweaver.update({'additional_dvds': netweaver.additional_dvds|json}) %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/setup/init.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/setup/init.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/setup/init.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/setup/init.sls
2020-07-06 20:02:16.000000000 +0200
@@ -4,7 +4,6 @@
{% if netweaver.install_packages is sameas true %}
- netweaver.setup.packages
{% endif %}
- - netweaver.setup.install_pydbapi
- netweaver.setup.shared_disk
- netweaver.setup.virtual_addresses
- netweaver.setup.sap_nfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/setup/install_pydbapi.sls
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/setup/install_pydbapi.sls
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/netweaver/setup/install_pydbapi.sls
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/netweaver/setup/install_pydbapi.sls
1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-{%- from "netweaver/map.jinja" import netweaver with context -%}
-{% set host = grains['host'] %}
-
-{% for node in netweaver.nodes if node.host == host and node.sap_instance in
['db', 'pas', 'aas'] %}
-{% if loop.first %}
-{% set pydbapi_output_dir = '/tmp/pydbapi' %}
-nw_install_python_pip:
- pkg.installed:
- {% if grains['pythonversion'][0] == 2 %}
- - name: python-pip
- {% else %}
- - name: python3-pip
- {% endif %}
- - retry:
- attempts: 3
- interval: 15
- - resolve_capabilities: true
-
-nw_extract_pydbapi_client:
- hana.pydbapi_extracted:
- - name: PYDBAPI.TGZ
- - software_folders: {{ netweaver.additional_dvds }}
- - output_dir: {{ pydbapi_output_dir }}
- - hana_version: '20'
- - force: true
-
-# pip.installed fails as it cannot manage propler file names with regular
expressions
-# TODO: Improve this to use pip.installed somehow
-nw_install_pydbapi_client:
- cmd.run:
- {% if grains['pythonversion'][0] == 2 %}
- - name: /usr/bin/python -m pip install {{ pydbapi_output_dir
}}/hdbcli-*.tar.gz
- {% else %}
- - name: /usr/bin/python3 -m pip install {{ pydbapi_output_dir
}}/hdbcli-*.tar.gz
- {% endif %}
- - reload_modules: true
- - require:
- - nw_install_python_pip
- - nw_extract_pydbapi_client
-
-nw_reload_hdb_connector:
- module.run:
- - hana.reload_hdb_connector:
- - require:
- - nw_install_pydbapi_client
-
-nw_remove_pydbapi_client:
- file.absent:
- - name: {{ pydbapi_output_dir }}
- - onchanges:
- - nw_extract_pydbapi_client
-{% endif %}
-{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/pillar.example
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/pillar.example
--- old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/pillar.example
2020-06-04 17:22:28.000000000 +0200
+++ new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/pillar.example
2020-07-06 20:02:16.000000000 +0200
@@ -31,20 +31,23 @@
# Specify the path to already extracted SWPM installer folder
swpm_folder: your_swpm_folder_absolute_path
# Or specify the path to the sapcar executable & SWPM installer sar archive,
to extract the installer
- # The sar archive will be extracted to path specified at swpm_extract_dir
(optional, by default /sapmedia/NW/SWPM)
+ # The sar archive will be extracted to a subfolder SWPM, under
nw_extract_dir (optional, by default /sapmedia/NW/SWPM)
# Make sure to use the latest/compatible version of sapcar executable, and
that it has correct execute permissions
sapcar_exe_file: your_sapcar_exe_file_absolute_path
swpm_sar_file: your_swpm_sar_file_absolute_path
- swpm_extract_dir: location_to_extract_swpm_sar_absolute_path
+ nw_extract_dir: location_to_extract_nw_media_absolute_path
sapexe_folder: your_sapexe_sar_folder_absolute_path
# Folder where the installation files are stored. /tmp/swpm_unattended by
default. Set None to use
# SAP default folders (it will only work with ASCS and ERS).
# This folder content will be removed before the installation so be extra
careful!
installation_folder: /tmp/swpm_unattended
# DB/PAS/AAS instances require additional DVD folders like NW Export or HDB
Client folder
- additional_dvd:
- - required_dvd1_folder_absolute_path
- - required_dvd2_folder_absolute_path
+ # Provide the absolute path to software folder or archives with additional
SAP software needed to install netweaver
+ additional_dvds:
+ - /sapmedia/HANA/51053492
+ - /sapmedia/NW/51050829_3.ZIP
+ - /tmp/sap_media/51050818_part1.EXE
+ - /tmp/sapmedia/IMDB_SERVER.SAR
# Enable operations in ASCS and ERS to set HA environment correctly (HA
cluster is not installed)
ha_enabled: True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.4.4+git.1591284148.611687e/sapnwbootstrap-formula.changes
2020-06-04 17:22:28.000000000 +0200
+++
new/sapnwbootstrap-formula-0.4.4+git.1594058536.82f1049/sapnwbootstrap-formula.changes
2020-07-06 20:02:16.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu May 28 22:00:38 UTC 2020 - Simranpal Singh <[email protected]>
+
+- Version 0.5.0
+ * Add support to extract nw media archives
+ * This change brings non backward compatible changes. Remove default swpm
installer extract directory and
+ add nw_extract_dir variable to store all extracted NW media
+
+-------------------------------------------------------------------
Mon May 18 15:02:26 UTC 2020 - Xabier Arbulu <[email protected]>
- Version 0.4.4
