Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2019-12-09 21:38:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Mon Dec 9 21:38:16 2019 rev:2 rq:755361 version:0.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2019-12-02 13:33:14.672672162 +0100
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.4691/sapnwbootstrap-formula.changes
2019-12-09 21:38:23.830023160 +0100
@@ -1,0 +2,13 @@
+Mon Dec 9 18:45:49 UTC 2019 - Simranpal Singh <[email protected]>
+
+- Version bump 0.1.7
+ * Provide the option to set individual sapadm and <sid>adm passwords
+ and set master password as default for all NW instances
+
+-------------------------------------------------------------------
+Thu Dec 5 10:44:24 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.1.6
+ * Adapt the formula to work with azure standards
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.1.5.tar.gz
New:
----
sapnwbootstrap-formula-0.1.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.3QB0kc/_old 2019-12-09 21:38:24.198023014 +0100
+++ /var/tmp/diff_new_pack.3QB0kc/_new 2019-12-09 21:38:24.202023013 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.1.5
+Version: 0.1.7
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ sapnwbootstrap-formula-0.1.5.tar.gz ->
sapnwbootstrap-formula-0.1.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/ha_cluster.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/ha_cluster.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/ha_cluster.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/ha_cluster.sls 2019-12-09
20:06:53.750104822 +0100
@@ -22,7 +22,7 @@
- dispstatus: GREEN
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- retry:
attempts: 20
interval: 30
@@ -32,7 +32,7 @@
- name: {{ node.sap_instance.lower() }}
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
stop_sap_instance_{{ instance_name }}:
module.run:
@@ -40,7 +40,7 @@
- function: 'Stop'
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
@@ -50,7 +50,7 @@
- function: 'StopService'
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
@@ -97,7 +97,7 @@
- function: 'StartService {{ node.sid.upper() }}'
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
@@ -107,7 +107,7 @@
- function: 'Start'
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/install_aas.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/install_aas.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/install_aas.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/install_aas.sls 2019-12-09
20:06:53.750104822 +0100
@@ -13,7 +13,9 @@
- name: /tmp/aas.inifile.params
- template: jinja
- context: # set up context for template aas.inifile.params.j2
- master_password: {{ node.master_password }}
+ master_password: {{ netweaver.master_password }}
+ sap_adm_password: {{
netweaver.sap_adm_password|default(netweaver.master_password) }}
+ sid_adm_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
sid: {{ node.sid }}
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
@@ -45,7 +47,7 @@
netweaver.installed:
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- software_path: {{ netweaver.swpm_folder }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/install_ascs.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/install_ascs.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/install_ascs.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/install_ascs.sls 2019-12-09
20:06:53.750104822 +0100
@@ -12,7 +12,9 @@
- name: /tmp/ascs.inifile.params
- template: jinja
- context: # set up context for template ascs.inifile.params.j2
- master_password: {{ node.master_password }}
+ master_password: {{ netweaver.master_password }}
+ sap_adm_password: {{
netweaver.sap_adm_password|default(netweaver.master_password) }}
+ sid_adm_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
sid: {{ node.sid }}
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
@@ -22,7 +24,7 @@
netweaver.installed:
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- software_path: {{ netweaver.swpm_folder }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/install_db.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/install_db.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/install_db.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/install_db.sls 2019-12-09
20:06:53.750104822 +0100
@@ -13,7 +13,9 @@
- name: /tmp/db.inifile.params
- template: jinja
- context: # set up context for template db.inifile.params.j2
- master_password: {{ node.master_password }}
+ master_password: {{ netweaver.master_password }}
+ sap_adm_password: {{
netweaver.sap_adm_password|default(netweaver.master_password) }}
+ sid_adm_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
sid: {{ node.sid }}
download_basket: {{ netweaver.sapexe_folder }}
schema_name: {{ netweaver.schema.name|default('SAPABAP1') }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/install_ers.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/install_ers.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/install_ers.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/install_ers.sls 2019-12-09
20:06:53.750104822 +0100
@@ -12,7 +12,9 @@
- name: /tmp/ers.inifile.params
- template: jinja
- context: # set up context for template ers.inifile.params.j2
- master_password: {{ node.master_password }}
+ master_password: {{ netweaver.master_password }}
+ sap_adm_password: {{
netweaver.sap_adm_password|default(netweaver.master_password) }}
+ sid_adm_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
sid: {{ node.sid }}
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
@@ -29,7 +31,7 @@
netweaver.installed:
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- software_path: {{ netweaver.swpm_folder }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
@@ -39,7 +41,7 @@
- product_id: NW_ERS:NW750.HDB.ABAPHA
- cwd: {{ netweaver.installation_folder }}
- additional_dvds: {{ netweaver.additional_dvds }}
- - ascs_password: {{ node.master_password }}
+ - ascs_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- timeout: 1500
- interval: 15
- require:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/install_pas.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/install_pas.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/install_pas.sls 2019-11-28
16:29:26.120040178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/install_pas.sls 2019-12-09
20:06:53.750104822 +0100
@@ -13,7 +13,9 @@
- name: /tmp/pas.inifile.params
- template: jinja
- context: # set up context for template pas.inifile.params.j2
- master_password: {{ node.master_password }}
+ master_password: {{ netweaver.master_password }}
+ sap_adm_password: {{
netweaver.sap_adm_password|default(netweaver.master_password) }}
+ sid_adm_password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
sid: {{ node.sid }}
instance: {{ instance }}
virtual_hostname: {{ node.virtual_host }}
@@ -46,7 +48,7 @@
netweaver.installed:
- name: {{ node.sid.lower() }}
- inst: {{ instance }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- software_path: {{ netweaver.swpm_folder }}
- root_user: {{ node.root_user }}
- root_password: {{ node.root_password }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/setup/mount.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/setup/mount.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/setup/mount.sls 2019-11-28
16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/setup/mount.sls 2019-12-09
20:06:53.750104822 +0100
@@ -5,33 +5,47 @@
{% set instance = '{:0>2}'.format(node.instance) %}
{% set instance_name = node.sid~'_'~instance %}
-{% if node.sap_instance.lower() == 'ascs' %}
+{% if node.sap_instance.lower() in ['ascs', 'ers'] %}
-mount_ascs_{{ instance_name }}:
+{% if ':' in node.shared_disk_dev %} # This means that the device is a nfs
share
+{% set device = node.shared_disk_dev %}
+{% set fstype = 'nfs4' %}
+{% else %}
+# device is shared_device_disk2 for ascs or shared_device_disk3 for ers
+{% set device = node.shared_disk_dev~'2' if node.sap_instance.lower() ==
'ascs' else node.shared_disk_dev~'3' %}
+{% set fstype = 'xfs' %}
+{% endif %}
+
+mount_{{ node.sap_instance.lower() }}_{{ instance_name }}:
mount.mounted:
- - name: /usr/sap/{{ node.sid.upper() }}/ASCS{{ instance }}
- - device: {{ node.shared_disk_dev }}2
- - fstype: xfs
+ - name: /usr/sap/{{ node.sid.upper() }}/{{ node.sap_instance.upper() }}{{
instance }}
+ - device: {{ device }}
+ - fstype: {{ fstype }}
- mkmnt: True
- - persist: True
- opts:
- defaults
-{% elif node.sap_instance.lower() == 'ers' %}
+# This second loop is used to find ASCS/ERS shared instances to share their
data as it's needed to enable HA before the cluster is created
+{% for shared_node in netweaver.nodes if host != shared_node.host and
shared_node.sid == node.sid and shared_node.sap_instance.lower() in ['ascs',
'ers'] and ':' in shared_node.shared_disk_dev %}
+
+{% set shared_instance = '{:0>2}'.format(shared_node.instance) %}
+{% set shared_instance_name = shared_node.sid~'_'~shared_instance %}
-mount_ers_{{ instance_name }}:
+mount_{{ shared_node.sap_instance.lower() }}_{{ shared_instance_name }}:
mount.mounted:
- - name: /usr/sap/{{ node.sid.upper() }}/ERS{{ instance }}
- - device: {{ node.shared_disk_dev }}3
- - fstype: xfs
+ - name: /usr/sap/{{ shared_node.sid.upper() }}/{{
shared_node.sap_instance.upper() }}{{ shared_instance }}
+ - device: {{ shared_node.shared_disk_dev }}
+ - fstype: {{ fstype }}
- mkmnt: True
- - persist: True
- opts:
- defaults
+{% endfor %}
+
+
{% elif node.sap_instance.lower() in ['pas', 'aas'] %}
-create_dialog_folder_{{ node.sap_instance.lower() }}_{{ instance_name }}:
+create_folder_{{ node.sap_instance.lower() }}_{{ instance_name }}:
file.directory:
- name: /usr/sap/{{ node.sid.upper() }}/D{{ instance }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/setup/shared_disk.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/setup/shared_disk.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/setup/shared_disk.sls
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/setup/shared_disk.sls
2019-12-09 20:06:53.750104822 +0100
@@ -1,7 +1,7 @@
{%- from "netweaver/map.jinja" import netweaver with context -%}
{% set host = grains['host'] %}
-{% for node in netweaver.nodes if host == node.host and node.shared_disk_dev
is defined %}
+{% for node in netweaver.nodes if host == node.host and node.shared_disk_dev
is defined and ':' not in node.shared_disk_dev %}
{% if node.init_shared_disk is defined and node.init_shared_disk == True %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/netweaver/setup/users.sls
new/sapnwbootstrap-formula-0.1.7/netweaver/setup/users.sls
--- old/sapnwbootstrap-formula-0.1.5/netweaver/setup/users.sls 2019-11-28
16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/netweaver/setup/users.sls 2019-12-09
20:06:53.750104822 +0100
@@ -19,7 +19,7 @@
- home: /home/{{ node.sid.lower() }}adm
- uid: {{ netweaver.sidadm_user.uid }}
- gid: {{ netweaver.sidadm_user.gid }}
- - password: {{ node.master_password }}
+ - password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- hash_password: True
- groups:
- sapsys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sapnwbootstrap-formula-0.1.5/pillar.example
new/sapnwbootstrap-formula-0.1.7/pillar.example
--- old/sapnwbootstrap-formula-0.1.5/pillar.example 2019-11-28
16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/pillar.example 2019-12-09
20:06:53.750104822 +0100
@@ -14,6 +14,12 @@
sidadm_user:
uid: 1001
gid: 1002
+ # sid_adm_password is optional, master password will be used as default, if
value is not defined
+ sid_adm_password: your_sidadm_password
+ # sap_adm_password is optional, master password will be used as default, if
value is not defined
+ sap_adm_password: your_sapadm_password
+ # Master password is used for all the SAP users that are created
+ master_password: your_password
# Clean /sapmnt/{sid} and /usr/sap/{sid}/SYS content. It will only work if
ASCS node is defined.
# True by default
clean_nfs: True
@@ -52,7 +58,6 @@
instance: 00
root_user: root
root_password: linux
- master_password: your_password
shared_disk_dev: /dev/sbd
init_shared_disk: True
sap_instance: ascs
@@ -63,7 +68,6 @@
instance: 10
root_user: root
root_password: linux
- master_password: your_password
shared_disk_dev: /dev/sbd
sap_instance: ers
@@ -74,7 +78,6 @@
instance: 00
root_user: root
root_password: linux
- master_password: your_password
sap_instance: db
- host: hacert03
@@ -84,7 +87,6 @@
instance: 01
root_user: root
root_password: linux
- master_password: your_password
sap_instance: pas
- host: hacert04
@@ -93,5 +95,4 @@
instance: 02
root_user: root
root_password: linux
- master_password: your_password
sap_instance: aas
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.1.7/sapnwbootstrap-formula.changes
--- old/sapnwbootstrap-formula-0.1.5/sapnwbootstrap-formula.changes
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/sapnwbootstrap-formula.changes
2019-12-09 20:06:53.750104822 +0100
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Mon Dec 9 18:45:49 UTC 2019 - Simranpal Singh <[email protected]>
+
+- Version bump 0.1.7
+ * Provide the option to set individual sapadm and <sid>adm passwords
+ and set master password as default for all NW instances
+
+-------------------------------------------------------------------
+Thu Dec 5 10:44:24 UTC 2019 - Xabier Arbulu <[email protected]>
+
+- Version bump 0.1.6
+ * Adapt the formula to work with azure standards
+
+-------------------------------------------------------------------
Thu Nov 28 10:14:56 UTC 2019 - Xabier Arbulu <[email protected]>
- Version bump 0.1.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/sapnwbootstrap-formula.spec
new/sapnwbootstrap-formula-0.1.7/sapnwbootstrap-formula.spec
--- old/sapnwbootstrap-formula-0.1.5/sapnwbootstrap-formula.spec
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/sapnwbootstrap-formula.spec
2019-12-09 20:06:53.750104822 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.1.5
+Version: 0.1.7
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/aas.inifile.params.j2
new/sapnwbootstrap-formula-0.1.7/templates/aas.inifile.params.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/aas.inifile.params.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/aas.inifile.params.j2
2019-12-09 20:06:53.750104822 +0100
@@ -106,7 +106,7 @@
# hostAgent.domain =
# Password for the 'sapadm' user of the SAP Host Agent
-# hostAgent.sapAdmPassword =
+hostAgent.sapAdmPassword = {{ sap_adm_password }}
# Windows only: The domain of all users of this SAP system. Leave empty for
default.
# nwUsers.sapDomain =
@@ -124,7 +124,7 @@
nwUsers.sidAdmUID =
# The password of the '<sapsid>adm' user
-# nwUsers.sidadmPassword =
+nwUsers.sidadmPassword = {{ sid_adm_password }}
# ABAP schema password
# storageBasedCopy.abapSchemaPassword =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/ascs.inifile.params.j2
new/sapnwbootstrap-formula-0.1.7/templates/ascs.inifile.params.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/ascs.inifile.params.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/ascs.inifile.params.j2
2019-12-09 20:06:53.750104822 +0100
@@ -87,7 +87,7 @@
# hostAgent.domain =
# Password for the 'sapadm' user of the SAP Host Agent
-# hostAgent.sapAdmPassword =
+hostAgent.sapAdmPassword = {{ sap_adm_password }}
# Windows only: The domain of all users of this SAP system. Leave empty for
default.
# nwUsers.sapDomain =
@@ -105,4 +105,4 @@
nwUsers.sidAdmUID =
# The password of the '<sapsid>adm' user
-# nwUsers.sidadmPassword =
+nwUsers.sidadmPassword = {{ sid_adm_password }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/cluster_resources.j2
new/sapnwbootstrap-formula-0.1.7/templates/cluster_resources.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/cluster_resources.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/cluster_resources.j2
2019-12-09 20:06:53.750104822 +0100
@@ -4,14 +4,15 @@
{% set ers_instance = '{:0>2}'.format(data.ers_instance) %}
{% set ascs_device = data.ascs_device %}
{% set ers_device = data.ers_device %}
+{% set ascs_fstype = data.ascs_fstype %}
+{% set ers_fstype = data.ers_fstype %}
{% set ascs_ip_address = data.ascs_ip_address %}
{% set ers_ip_address = data.ers_ip_address %}
{% set ascs_virtual_host = data.ascs_virtual_host %}
{% set ers_virtual_host = data.ers_virtual_host %}
primitive rsc_fs_{{ sid }}_ASCS{{ ascs_instance }} Filesystem \
- params device="{{ ascs_device }}" directory="/usr/sap/{{ sid }}/ASCS{{
ascs_instance }}" \
- fstype=xfs \
+ params device="{{ ascs_device }}" directory="/usr/sap/{{ sid }}/ASCS{{
ascs_instance }}" fstype={{ ascs_fstype|default("xfs") }} \
op start timeout=60s interval=0 \
op stop timeout=60s interval=0 \
op monitor interval=20s timeout=40s
@@ -26,29 +27,39 @@
AUTOMATIC_RECOVER=false \
meta resource-stickiness=5000 failure-timeout=60 \
migration-threshold=1 priority=10
+{% if data.platform == "azure" %}
+primitive nc_{{ sid }}_ASCS anything \
+ params binfile="/usr/bin/socat" cmdline_options="-U TCP-LISTEN:620{{
ascs_instance }},backlog=10,fork,reuseaddr /dev/null" \
+ op monitor timeout=20s interval=10 depth=0
+{% endif %}
- group grp_{{ sid }}_ASCS{{ ascs_instance }} \
- rsc_ip_{{ sid }}_ASCS{{ ascs_instance }} rsc_fs_{{ sid }}_ASCS{{
ascs_instance }} rsc_sap_{{ sid }}_ASCS{{ ascs_instance }} \
- meta resource-stickiness=3000
+group grp_{{ sid }}_ASCS{{ ascs_instance }} \
+ rsc_ip_{{ sid }}_ASCS{{ ascs_instance }} rsc_fs_{{ sid }}_ASCS{{
ascs_instance }} rsc_sap_{{ sid }}_ASCS{{ ascs_instance }} {% if data.platform
== "azure" %} nc_{{ sid }}_ASCS {% endif %} \
+ meta resource-stickiness=3000
- primitive rsc_fs_{{ sid }}_ERS{{ ers_instance }} Filesystem \
- params device="{{ ers_device }}" directory="/usr/sap/{{ sid }}/ERS{{
ers_instance }}" fstype=xfs \
- op start timeout=60s interval=0 \
- op stop timeout=60s interval=0 \
- op monitor interval=20s timeout=40s
- primitive rsc_ip_{{ sid }}_ERS{{ ers_instance }} IPaddr2 \
- params ip={{ ers_ip_address }} \
- op monitor interval=10s timeout=20s
- primitive rsc_sap_{{ sid }}_ERS{{ ers_instance }} SAPInstance \
- operations $id=rsc_sap_{{ sid }}_ERS{{ ers_instance }}-operations \
- op monitor interval=11 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 }}" \
- AUTOMATIC_RECOVER=false IS_ERS=true \
- meta priority=1000
+primitive rsc_fs_{{ sid }}_ERS{{ ers_instance }} Filesystem \
+ params device="{{ ers_device }}" directory="/usr/sap/{{ sid }}/ERS{{
ers_instance }}" fstype={{ ers_fstype|default("xfs") }} \
+ op start timeout=60s interval=0 \
+ op stop timeout=60s interval=0 \
+ op monitor interval=20s timeout=40s
+primitive rsc_ip_{{ sid }}_ERS{{ ers_instance }} IPaddr2 \
+ params ip={{ ers_ip_address }} \
+ op monitor interval=10s timeout=20s
+primitive rsc_sap_{{ sid }}_ERS{{ ers_instance }} SAPInstance \
+ operations $id=rsc_sap_{{ sid }}_ERS{{ ers_instance }}-operations \
+ op monitor interval=11 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 }}" \
+ AUTOMATIC_RECOVER=false IS_ERS=true \
+ meta priority=1000
+{% if data.platform == "azure" %}
+primitive nc_{{ sid }}_ERS anything \
+ params binfile="/usr/bin/socat" cmdline_options="-U TCP-LISTEN:621{{
ers_instance }},backlog=10,fork,reuseaddr /dev/null" \
+ op monitor timeout=20s interval=10 depth=0
+{% endif %}
group grp_{{ sid }}_ERS{{ ers_instance }} \
- rsc_ip_{{ sid }}_ERS{{ ers_instance }} rsc_fs_{{ sid }}_ERS{{ ers_instance }}
rsc_sap_{{ sid }}_ERS{{ ers_instance }}
+ rsc_ip_{{ sid }}_ERS{{ ers_instance }} rsc_fs_{{ sid }}_ERS{{ ers_instance
}} rsc_sap_{{ sid }}_ERS{{ ers_instance }} {% if data.platform == "azure" %}
nc_{{ sid }}_ERS {% endif %}
colocation col_sap_{{ sid }}_no_both -5000: grp_{{ sid }}_ERS{{ ers_instance
}} grp_{{ sid }}_ASCS{{ ascs_instance }}
location loc_sap_{{ sid }}_failover_to_ers rsc_sap_{{ sid }}_ASCS{{
ascs_instance }} \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/db.inifile.params.j2
new/sapnwbootstrap-formula-0.1.7/templates/db.inifile.params.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/db.inifile.params.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/db.inifile.params.j2
2019-12-09 20:06:53.750104822 +0100
@@ -168,7 +168,7 @@
# hostAgent.domain =
# Password for the 'sapadm' user of the SAP Host Agent
-hostAgent.sapAdmPassword = {{ master_password }}
+hostAgent.sapAdmPassword = {{ sap_adm_password }}
# Windows only: The domain of all users of this SAP system. Leave empty for
default.
# nwUsers.sapDomain =
@@ -186,7 +186,7 @@
nwUsers.sidAdmUID =
# The password of the '<sapsid>adm' user
-nwUsers.sidadmPassword = {{ master_password }}
+nwUsers.sidadmPassword = {{ sid_adm_password }}
# ABAP schema password
# storageBasedCopy.abapSchemaPassword =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/ers.inifile.params.j2
new/sapnwbootstrap-formula-0.1.7/templates/ers.inifile.params.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/ers.inifile.params.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/ers.inifile.params.j2
2019-12-09 20:06:53.750104822 +0100
@@ -16,6 +16,9 @@
# Specify whether the all operating system users are to be removed from group
'sapinst' after the execution of Software Provisioning Manager has completed.
NW_Delete_Sapinst_Users.removeUsers = true
+# Master password
+NW_GetMasterPassword.masterPwd = {{ master_password }}
+
# SAP INTERNAL USE ONLY
# NW_System.installSAPHostAgent = true
@@ -44,7 +47,7 @@
# hostAgent.domain =
# Password for the 'sapadm' user of the SAP Host Agent
-hostAgent.sapAdmPassword = {{ master_password }}
+hostAgent.sapAdmPassword = {{ sap_adm_password }}
# Windows only: The domain of all users of this SAP system. Leave empty for
default.
# nwUsers.sapDomain =
@@ -62,7 +65,7 @@
nwUsers.sidAdmUID =
# The password of the '<sapsid>adm' user
-nwUsers.sidadmPassword = {{ master_password }}
+nwUsers.sidadmPassword = {{ sid_adm_password }}
# The instance number of the ERS instance. Leave empty for default.
nw_instance_ers.ersInstanceNumber = {{ instance }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.1.5/templates/pas.inifile.params.j2
new/sapnwbootstrap-formula-0.1.7/templates/pas.inifile.params.j2
--- old/sapnwbootstrap-formula-0.1.5/templates/pas.inifile.params.j2
2019-11-28 16:29:26.124042178 +0100
+++ new/sapnwbootstrap-formula-0.1.7/templates/pas.inifile.params.j2
2019-12-09 20:06:53.750104822 +0100
@@ -173,7 +173,7 @@
# hostAgent.domain =
# Password for the 'sapadm' user of the SAP Host Agent
-# hostAgent.sapAdmPassword =
+hostAgent.sapAdmPassword = {{ sap_adm_password }}
# Windows only: The domain of all users of this SAP system. Leave empty for
default.
# nwUsers.sapDomain =
@@ -191,7 +191,7 @@
nwUsers.sidAdmUID =
# The password of the '<sapsid>adm' user
-# nwUsers.sidadmPassword =
+nwUsers.sidadmPassword = {{ sid_adm_password }}
# ABAP schema password
# storageBasedCopy.abapSchemaPassword =
