Merge pull request #51 from Simranpal/feature/extract-nw-archives

Add support to extract nw media archives
SUSE · Jul 6, 2020 · 82f1049 · 82f1049
2 parents 611687e + da99d01
commit 82f1049
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ services:
 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 --git a/netweaver/defaults.yaml b/netweaver/defaults.yaml
@@ -2,7 +2,7 @@ netweaver:
   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 --git a/netweaver/extract_installer.sls b/netweaver/extract_installer.sls
diff --git a/netweaver/extract_nw_archives.sls b/netweaver/extract_nw_archives.sls
@@ -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 %}
diff --git a/netweaver/init.sls b/netweaver/init.sls
@@ -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 --git a/netweaver/install_aas.sls b/netweaver/install_aas.sls
@@ -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 @@ netweaver_install_{{ instance_name }}:
     - 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 @@ netweaver_install_{{ instance_name }}:
     - 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 --git a/netweaver/install_ascs.sls b/netweaver/install_ascs.sls
@@ -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 @@ netweaver_install_{{ instance_name }}:
     - 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 @@ netweaver_install_{{ instance_name }}:
     - 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 --git a/netweaver/install_db.sls b/netweaver/install_db.sls
@@ -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 @@ netweaver_install_{{ instance_name }}:
     - 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 @@ netweaver_install_{{ instance_name }}:
     - 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 --git a/netweaver/install_ers.sls b/netweaver/install_ers.sls
@@ -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 @@ netweaver_install_{{ instance_name }}:
     - 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 @@ netweaver_install_{{ instance_name }}:
     - 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 --git a/netweaver/install_pas.sls b/netweaver/install_pas.sls
@@ -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 @@ netweaver_install_{{ instance_name }}:
     - 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 @@ netweaver_install_{{ instance_name }}:
     - 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 --git a/netweaver/setup/install_pydbapi.sls → netweaver/install_pydbapi.sls b/netweaver/setup/install_pydbapi.sls → netweaver/install_pydbapi.sls
@@ -1,4 +1,6 @@
 {%- 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'] %}
@@ -19,7 +21,7 @@ nw_install_python_pip:
 nw_extract_pydbapi_client:
   hana.pydbapi_extracted:
     - name: PYDBAPI.TGZ
-    - software_folders: {{ netweaver.additional_dvds }}
+    - software_folders: {{ additional_dvd_folders }}
     - output_dir: {{ pydbapi_output_dir }}
     - hana_version: '20'
     - force: true

diff --git a/netweaver/map.jinja b/netweaver/map.jinja
@@ -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 --git a/netweaver/setup/init.sls b/netweaver/setup/init.sls
@@ -4,7 +4,6 @@ include:
 {% 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 --git a/pillar.example b/pillar.example
@@ -31,20 +31,23 @@ netweaver:
   # 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 --git a/sapnwbootstrap-formula.changes b/sapnwbootstrap-formula.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 28 22:00:38 UTC 2020 - Simranpal Singh <simranpal.singh@suse.com>
+
+- 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 <xarbulu@suse.com>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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}) %}