Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2021-02-15 23:15:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Mon Feb 15 23:15:09 2021 rev:23 rq:872640 version:0.6.1+git.1613419142.d0421ad
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2021-02-09 21:17:55.818889189 +0100
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.28504/sapnwbootstrap-formula.changes
2021-02-15 23:17:12.539477239 +0100
@@ -1,0 +2,13 @@
+Mon Feb 15 12:34:27 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Give the option to mount /sapmnt folder locally without using
+ a NFS share
+- Make /sapmnt path configurable using `sapmnt_path` pillar variable
+
+-------------------------------------------------------------------
+Wed Feb 10 16:14:24 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Update PAS and AAS templates to use HANA sid and instance number
+ to create the configuration file
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd.tar.gz
New:
----
sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.fPoLOY/_old 2021-02-15 23:17:13.027477968 +0100
+++ /var/tmp/diff_new_pack.fPoLOY/_new 2021-02-15 23:17:13.031477973 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.6.1+git.1612883041.2b676fd
+Version: 0.6.1+git.1613419142.d0421ad
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.fPoLOY/_old 2021-02-15 23:17:13.063478022 +0100
+++ /var/tmp/diff_new_pack.fPoLOY/_new 2021-02-15 23:17:13.067478027 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
<param name="versionformat">0.6.1+git.%ct.%h</param>
- <param name="revision">2b676fd0c7be96d732e6a9f7186959f8248e54bb</param>
+ <param name="revision">d0421adc4a7c181a1f157209b823cfc150a204f6</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd.tar.gz ->
sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/.github/workflows/formula-ci.yml
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/.github/workflows/formula-ci.yml
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/.github/workflows/formula-ci.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/.github/workflows/formula-ci.yml
2021-02-15 20:59:02.000000000 +0100
@@ -0,0 +1,81 @@
+name: Formula CI
+
+# this workflow will
+# - run formula validation step - test/validate-formula.sh
+# - deliver the package content to the configured repository
+# - submit the new package content to the upstream repository
+
+on: [push, pull_request]
+
+env:
+ PACKAGE_NAME: sapnwbootstrap-formula
+
+jobs:
+ validation:
+ runs-on: ubuntu-18.04
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - name: add salt repository
+ uses: myci-actions/add-deb-repo@4
+ with:
+ repo: deb http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/
bionic main
+ key-server:
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+ - name: install salt
+ run: sudo apt-get install salt-common
+ - name: validation
+ run: ci/validate-formula.sh
+
+ delivery:
+ needs: validation
+ runs-on: ubuntu-18.04
+ if: ${{ github.event_name != 'pull_request' }}
+ container:
+ image: shap/continuous_deliver
+ env:
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ # OSC credentials must be configured beforehand as the HOME variables
cannot be changed from /github/home
+ # that is used to run osc commands
+ - name: configure OSC
+ run: |
+ /scripts/init_osc_creds.sh
+ mkdir -p $HOME/.config/osc
+ cp /root/.config/osc/oscrc $HOME/.config/osc
+ - name: deliver package
+ run: |
+ sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \
+ sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \
+ /scripts/upload.sh
+
+ submission:
+ needs: [validation, delivery]
+ runs-on: ubuntu-18.04
+ if: ${{ github.event_name != 'pull_request' && github.ref ==
'refs/heads/master' }}
+ container:
+ image: shap/continuous_deliver
+ env:
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - name: configure OSC
+ run: |
+ /scripts/init_osc_creds.sh
+ mkdir -p $HOME/.config/osc
+ cp /root/.config/osc/oscrc $HOME/.config/osc
+ - name: submit package
+ run: |
+ sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \
+ sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \
+ /scripts/submit.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/.travis.yml
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/.travis.yml
--- old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/.travis.yml
2021-02-09 16:04:01.000000000 +0100
+++ new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/.travis.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-sudo: required
-services:
- - docker
-
-dist: bionic
-addons:
- apt:
- sources:
- - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/ bionic main'
- key_url:
'http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub'
- packages:
- - salt-common
-
-stages:
- - validation
- - delivery
- - submit
-
-jobs:
- include:
- - stage: validation
-
- script:
- - |
- # validate states
- ci/validate-formula.sh
-
- - stage: delivery
- if: type != pull_request
- env:
- - FOLDER=/package
- - PACKAGE_NAME=sapnwbootstrap-formula
-
- before_install:
- - docker pull shap/continuous_deliver:latest
-
- script:
- - |
- docker run -t -v "$(pwd):/package" -w /package \
- -e OBS_USER -e OBS_PASS -e FOLDER -e OBS_PROJECT -e PACKAGE_NAME \
- shap/continuous_deliver \
- /bin/bash -c "sed -i 's~%%VERSION%%~$TRAVIS_COMMIT~' _service && \
- sed -i 's~%%REPOSITORY%%~$TRAVIS_REPO_SLUG~' _service && \
- /scripts/upload.sh"
-
- - stage: submit
- if: type != pull_request AND branch = master
- env:
- - PACKAGE_NAME=sapnwbootstrap-formula
-
- before_install:
- - docker pull shap/continuous_deliver:latest
-
- script:
- - |
- docker run -t -v "$(pwd):/package" -w /package \
- -e OBS_USER -e OBS_PASS -e OBS_PROJECT -e PACKAGE_NAME -e
TARGET_PROJECT shap/continuous_deliver \
- /scripts/submit.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/defaults.yaml
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/defaults.yaml
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/defaults.yaml
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/defaults.yaml
2021-02-15 20:59:02.000000000 +0100
@@ -5,6 +5,8 @@
nw_extract_dir: /sapmedia_extract/NW
additional_dvds: []
ha_enabled: True
+ sapmnt_path: /sapmnt
+ sapmnt_inst_media: "" # NFS share to mount /sapmnt and /usr/sap/{sid}/SYS.
Empty string means that folders are mounted locally
nfs_version: nfs4 # Used to connect to the nfs share
nfs_options: defaults
# Set this entry to false to disable creating swap
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_aas.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_aas.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_aas.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_aas.sls
2021-02-15 20:59:02.000000000 +0100
@@ -28,8 +28,11 @@
download_basket: {{ netweaver.sapexe_folder }}
schema_name: {{ netweaver.schema.name|default('SAPABAP1') }}
schema_password: {{ netweaver.schema.password }}
+ hana_host: {{ netweaver.hana.host }}
+ hana_sid: {{ netweaver.hana.sid }}
hana_password: {{ netweaver.hana.password }}
hana_inst: {{ hana_instance }}
+ sapmnt_path: {{ netweaver.sapmnt_path }}
{% if node.extra_parameters is defined %}
update_aas_inifile_{{ instance_name }}:
@@ -43,7 +46,7 @@
check_sapprofile_directory_exists_{{ instance_name }}:
file.exists:
- - name: /sapmnt/{{ node.sid.upper() }}/profile
+ - name: {{ netweaver.sapmnt_path }}/{{ node.sid.upper() }}/profile
- retry:
attempts: 70
interval: 30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_ascs.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_ascs.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_ascs.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_ascs.sls
2021-02-15 20:59:02.000000000 +0100
@@ -26,6 +26,7 @@
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
download_basket: {{ netweaver.sapexe_folder }}
+ sapmnt_path: {{ netweaver.sapmnt_path }}
{% if node.extra_parameters is defined %}
update_ascs_inifile_{{ instance_name }}:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_db.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_db.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_db.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_db.sls
2021-02-15 20:59:02.000000000 +0100
@@ -31,6 +31,7 @@
hana_sid: {{ netweaver.hana.sid }}
hana_password: {{ netweaver.hana.password }}
hana_inst: {{ hana_instance }}
+ sapmnt_path: {{ netweaver.sapmnt_path }}
{% if node.extra_parameters is defined %}
update_db_inifile_{{ instance_name }}:
@@ -44,7 +45,7 @@
check_sapprofile_directory_exists_{{ instance_name }}:
file.exists:
- - name: /sapmnt/{{ node.sid.upper() }}/profile
+ - name: {{ netweaver.sapmnt_path }}/{{ node.sid.upper() }}/profile
- retry:
attempts: 70
interval: 30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_ers.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_ers.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_ers.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_ers.sls
2021-02-15 20:59:02.000000000 +0100
@@ -26,6 +26,7 @@
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
download_basket: {{ netweaver.sapexe_folder }}
+ sapmnt_path: {{ netweaver.sapmnt_path }}
{% if node.extra_parameters is defined %}
update_ers_inifile_{{ instance_name }}:
@@ -39,7 +40,7 @@
check_sapprofile_directory_exists_{{ instance_name }}:
file.exists:
- - name: /sapmnt/{{ node.sid.upper() }}/profile
+ - name: {{ netweaver.sapmnt_path }}/{{ node.sid.upper() }}/profile
- retry:
attempts: 70
interval: 30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_pas.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_pas.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/install_pas.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/install_pas.sls
2021-02-15 20:59:02.000000000 +0100
@@ -30,8 +30,11 @@
schema_name: {{ netweaver.schema.name|default('SAPABAP1') }}
schema_password: {{ netweaver.schema.password }}
ascs_virtual_hostname: {{ node.ascs_virtual_host }}
+ hana_host: {{ netweaver.hana.host }}
+ hana_sid: {{ netweaver.hana.sid }}
hana_password: {{ netweaver.hana.password }}
hana_inst: {{ hana_instance }}
+ sapmnt_path: {{ netweaver.sapmnt_path }}
{% if node.extra_parameters is defined %}
update_pas_inifile_{{ instance_name }}:
@@ -45,7 +48,7 @@
check_sapprofile_directory_exists_{{ instance_name }}:
file.exists:
- - name: /sapmnt/{{ node.sid.upper() }}/profile
+ - name: {{ netweaver.sapmnt_path }}/{{ node.sid.upper() }}/profile
- retry:
attempts: 70
interval: 30
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/setup/sap_nfs.sls
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/setup/sap_nfs.sls
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/netweaver/setup/sap_nfs.sls
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/netweaver/setup/sap_nfs.sls
2021-02-15 20:59:02.000000000 +0100
@@ -1,20 +1,25 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
{% set host = grains['host'] %}
+{% for node in netweaver.nodes if host == node.host %}
+
+{% set instance = '{:0>2}'.format(node.instance) %}
+{% set instance_name = node.sid~'_'~instance %}
+
+# Provided sapmnt_inst_media is a NFS share path
+{% if ':' in netweaver.sapmnt_inst_media %}
+
+{% if loop.first %}
mount_sapmnt:
mount.mounted:
- - name: /sapmnt
+ - name: {{ netweaver.sapmnt_path }}
- device: {{ netweaver.sapmnt_inst_media }}/sapmnt
- fstype: {{ netweaver.nfs_version }}
- opts:
- {{ netweaver.nfs_options }}
- mkmnt: True
- persist: True
-
-{% for node in netweaver.nodes if host == node.host %}
-
-{% set instance = '{:0>2}'.format(node.instance) %}
-{% set instance_name = node.sid~'_'~instance %}
+{% endif %}
mount_usersapsys_{{ instance_name }}:
mount.mounted:
@@ -26,18 +31,30 @@
- mkmnt: True
- persist: True
-
{% if netweaver.clean_nfs and node.sap_instance == 'ascs' %}
-
clean_nfs_sapmnt_{{ instance_name }}:
file.absent:
- - name: /sapmnt/{{ node.sid.upper() }}
+ - name: {{ netweaver.sapmnt_path }}/{{ node.sid.upper() }}
clean_nfs_usr_{{ instance_name }}:
file.directory:
- name: /usr/sap/{{ node.sid.upper() }}/SYS
- clean: True
+{% endif %}
+# Create the `/sapmnt` and `/usr/sap/{sid}/SYS` locally
+{% else %}
+{% if loop.first %}
+create_folder_sapmnt:
+ file.directory:
+ - name: {{ netweaver.sapmnt_path }}
+ - makedirs: True
{% endif %}
+create_folder_sap_sys_{{ instance_name }}:
+ file.directory:
+ - name: /usr/sap/{{ node.sid.upper() }}/SYS
+ - makedirs: True
+
+{% endif %}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/pillar.example
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/pillar.example
--- old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/pillar.example
2021-02-09 16:04:01.000000000 +0100
+++ new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/pillar.example
2021-02-15 20:59:02.000000000 +0100
@@ -24,10 +24,24 @@
sap_adm_password: your_sapadm_password
# Master password is used for all the SAP users that are created
master_password: your_password
+
+ # Local path where sapmnt data is stored. This is a local path. This folder
can be mounted in a NFS share
+ # using `sapmnt_inst_media`
+ # /sapmnt by default
+ sapmnt_path: /sapmnt
+ # Define NFS share where `sapmnt` and `SYS` folder will be mounted. This NFS
share must already have
+ # the `sapmnt` and `usrsapsys` folders
+ # If it is not used or empty string is set, the `sapmnt` and `SYS` folder
are created locally
+ sapmnt_inst_media: your_nfs_share_SID_folder
# Clean /sapmnt/{sid} and /usr/sap/{sid}/SYS content. It will only work if
ASCS node is defined.
- # True by default
+ # True by default. It only works if a NFS share is defined in
`sapmnt_inst_media`
clean_nfs: True
- sapmnt_inst_media: your_nfs_share_SID_folder
+ # Used to connect to the nfs share
+ nfs_version: nfs4
+ nfs_options: defaults
+ # Use the next options for AWS for example
+ # nfs_options: rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2
+
# 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
@@ -48,19 +62,14 @@
- /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
- # Used to connect to the nfs share
- nfs_version: nfs4
- nfs_options: defaults
- # Use the next options for AWS for example
- # nfs_options: rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2
-
# syctl options. Some system options must be update for optimal usage, like
tcp keepalive parameter
# sysctl values based on:
# https://launchpad.support.sap.com/#/notes/1410736
- #
https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/high-availability-guide-suse#2d6008b0-685d-426c-b59e-6cd281fd45d7
+ #
https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/high-availability-guide-suse#2d6008b0-685d-426c-b59e-6cd281fd45d7
# Do not touch if not sure about the changes
#sysctl_values:
# net.ipv4.tcp_keepalive_time: 300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/sapnwbootstrap-formula.changes
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/sapnwbootstrap-formula.changes
2021-02-15 20:59:02.000000000 +0100
@@ -1,9 +1,22 @@
-------------------------------------------------------------------
+Mon Feb 15 12:34:27 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Give the option to mount /sapmnt folder locally without using
+ a NFS share
+- Make /sapmnt path configurable using `sapmnt_path` pillar variable
+
+-------------------------------------------------------------------
+Wed Feb 10 16:14:24 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
+
+- Update PAS and AAS templates to use HANA sid and instance number
+ to create the configuration file
+
+-------------------------------------------------------------------
Thu Jan 28 22:23:36 UTC 2021 - Simranpal Singh <simranpal.si...@suse.com>
- Version 0.6.1
* Fix error about missing instance installation requisite when monitoring is
enabled
- (bsc#1181541)
+ (bsc#1181541)
-------------------------------------------------------------------
Tue Jan 19 13:39:12 UTC 2021 - Xabier Arbulu <xarb...@suse.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/aas.inifile.params.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/aas.inifile.params.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/aas.inifile.params.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/aas.inifile.params.j2
2021-02-15 20:59:02.000000000 +0100
@@ -64,9 +64,21 @@
# Install the SAP HANA database client in a central or local directory.
Possible values are: 'SAPCPE', 'LOCAL'
# NW_HDB_DBClient.clientPathStrategy = LOCAL
+# Database host
+NW_HDB_getDBInfo.dbhost = {{ hana_host }}
+
+# Database system ID
+NW_HDB_getDBInfo.dbsid = {{ hana_sid.upper() }}
+
+# The instance number of the SAP HANA database server
+NW_HDB_getDBInfo.instanceNumber = {{ '{:0>2}'.format(hana_inst) }}
+
# Password of user 'SYSTEM' within the 'SystemDB' tenant in an SAP HANA
MultiDB server
NW_HDB_getDBInfo.systemDbPassword = {{ hana_password }}
+# Password of user 'SYSTEM' inside the SAP HANA database server
+NW_HDB_getDBInfo.systemPassword = {{ hana_password }}
+
# NW_SAPCrypto.SAPCryptoFile =
# SAP INTERNAL USE ONLY
@@ -91,7 +103,7 @@
# NW_getUnicode.isUnicode =
# Provide 'profile' directory of SAP Netweaver-based system.
-NW_readProfileDir.profileDir = /sapmnt/{{ sid.upper() }}/profile/
+NW_readProfileDir.profileDir = {{ sapmnt_path }}/{{ sid.upper() }}/profile/
# Windows only: The drive to use
# NW_readProfileDir.sapdrive =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/ascs.inifile.params.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/ascs.inifile.params.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/ascs.inifile.params.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/ascs.inifile.params.j2
2021-02-15 20:59:02.000000000 +0100
@@ -26,7 +26,7 @@
# NW_GetSidNoProfiles.sapdrive =
# Unix only: The SAP mount directory path. Default value is '/sapmnt'.
-# NW_GetSidNoProfiles.sapmnt = /sapmnt
+NW_GetSidNoProfiles.sapmnt = {{ sapmnt_path }}
# The SAP system ID <SAPSID> of the system to be installed
NW_GetSidNoProfiles.sid = {{ sid }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/cluster_resources.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/cluster_resources.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/cluster_resources.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/cluster_resources.j2
2021-02-15 20:59:02.000000000 +0100
@@ -14,6 +14,7 @@
{%- set ers_virtual_host = data.ers_virtual_host %}
{%- set monitoring_enabled = pillar.cluster.monitoring_enabled|default(False)
%}
{%- set native_fencing = data.native_fencing|default(True) %}
+{%- set sapmnt_path = data.sapmnt_path|default('/sapmnt') %}
{%- if data.ensa_version is defined %}
{%- set ensa_version = data.ensa_version|int %}
@@ -141,7 +142,7 @@
operations $id=rsc_sap_{{ sid }}_ASCS{{ ascs_instance }}-operations \
op monitor interval=120 timeout=60 on_fail=restart \
params InstanceName={{ sid }}_ASCS{{ ascs_instance }}_{{ ascs_virtual_host
}} \
- START_PROFILE="/sapmnt/{{ sid }}/profile/{{ sid }}_ASCS{{ ascs_instance
}}_{{ ascs_virtual_host }}" \
+ START_PROFILE="{{ sapmnt_path }}/{{ sid }}/profile/{{ sid }}_ASCS{{
ascs_instance }}_{{ ascs_virtual_host }}" \
AUTOMATIC_RECOVER=false \
meta resource-stickiness=5000 {% if ensa_version == 1 %}failure-timeout=60
migration-threshold=1 priority=10{%- endif %}
@@ -170,7 +171,7 @@
operations $id=rsc_sap_{{ sid }}_ERS{{ ers_instance }}-operations \
op monitor interval=120 timeout=60 on_fail=restart \
params InstanceName={{ sid }}_ERS{{ ers_instance }}_{{ ers_virtual_host }} \
- START_PROFILE="/sapmnt/{{ sid }}/profile/{{ sid }}_ERS{{ ers_instance
}}_{{ ers_virtual_host }}" \
+ START_PROFILE="{{ sapmnt_path }}/{{ sid }}/profile/{{ sid }}_ERS{{
ers_instance }}_{{ ers_virtual_host }}" \
AUTOMATIC_RECOVER=false IS_ERS=true {% if ensa_version == 1 %}meta
priority=1000{%- endif %}
group grp_{{ sid }}_ERS{{ ers_instance }} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/db.inifile.params.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/db.inifile.params.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/db.inifile.params.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/db.inifile.params.j2
2021-02-15 20:59:02.000000000 +0100
@@ -145,7 +145,7 @@
# NW_getUnicode.isUnicode =
# Provide 'profile' directory of SAP Netweaver-based system.
-NW_readProfileDir.profileDir = /sapmnt/{{ sid.upper() }}/profile/
+NW_readProfileDir.profileDir = {{ sapmnt_path }}/{{ sid.upper() }}/profile/
# Enter the path of the existing 'profile' directory.
# NW_readProfileDir.profilesAvailable = true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/ers.inifile.params.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/ers.inifile.params.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/ers.inifile.params.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/ers.inifile.params.j2
2021-02-15 20:59:02.000000000 +0100
@@ -35,7 +35,7 @@
# NW_getUnicode.isUnicode =
# Provide 'profile' directory of SAP Netweaver-based system.
-NW_readProfileDir.profileDir = /sapmnt/{{ sid.upper() }}/profile/
+NW_readProfileDir.profileDir = {{ sapmnt_path }}/{{ sid.upper() }}/profile/
# Windows only: The drive to use
# NW_readProfileDir.sapdrive =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/pas.inifile.params.j2
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/pas.inifile.params.j2
---
old/sapnwbootstrap-formula-0.6.1+git.1612883041.2b676fd/templates/pas.inifile.params.j2
2021-02-09 16:04:01.000000000 +0100
+++
new/sapnwbootstrap-formula-0.6.1+git.1613419142.d0421ad/templates/pas.inifile.params.j2
2021-02-15 20:59:02.000000000 +0100
@@ -115,9 +115,21 @@
# Install the SAP HANA database client in a central or local directory.
Possible values are: 'SAPCPE', 'LOCAL'
# NW_HDB_DBClient.clientPathStrategy = LOCAL
+# Database host
+NW_HDB_getDBInfo.dbhost = {{ hana_host }}
+
+# Database system ID
+NW_HDB_getDBInfo.dbsid = {{ hana_sid.upper() }}
+
+# The instance number of the SAP HANA database server
+NW_HDB_getDBInfo.instanceNumber = {{ '{:0>2}'.format(hana_inst) }}
+
# Password of user 'SYSTEM' within the 'SystemDB' tenant in an SAP HANA
MultiDB server
NW_HDB_getDBInfo.systemDbPassword = {{ hana_password }}
+# Password of user 'SYSTEM' inside the SAP HANA database server
+NW_HDB_getDBInfo.systemPassword = {{ hana_password }}
+
# Enable the instance agent (sapstartsrv) data supplier to send operating
system information to the System Landscape Directory (SLD). Default is 'false'.
# NW_SLD_Configuration.configureSld = false
@@ -158,7 +170,7 @@
# NW_getUnicode.isUnicode =
# Provide 'profile' directory of SAP Netweaver-based system.
-NW_readProfileDir.profileDir = /sapmnt/{{ sid.upper() }}/profile/
+NW_readProfileDir.profileDir = {{ sapmnt_path }}/{{ sid.upper() }}/profile/
# Windows only: The drive to use
# NW_readProfileDir.sapdrive =
