Hello community,
here is the log from the commit of package sapnwbootstrap-formula for
openSUSE:Factory checked in at 2020-12-18 19:59:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sapnwbootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.5145 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sapnwbootstrap-formula"
Fri Dec 18 19:59:23 2020 rev:20 rq:856713 version:0.5.2+git.1608216907.2f2ee2a
Changes:
--------
---
/work/SRC/openSUSE:Factory/sapnwbootstrap-formula/sapnwbootstrap-formula.changes
2020-12-04 21:29:09.818183003 +0100
+++
/work/SRC/openSUSE:Factory/.sapnwbootstrap-formula.new.5145/sapnwbootstrap-formula.changes
2020-12-18 19:59:48.782089707 +0100
@@ -1,0 +2,5 @@
+Thu Dec 3 16:12:08 UTC 2020 - Simranpal Singh <[email protected]>
+
+- Add requisites of netweaver installation to subsequent salt states
+
+-------------------------------------------------------------------
Old:
----
sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6.tar.gz
New:
----
sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sapnwbootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.AxiUze/_old 2020-12-18 19:59:49.338090302 +0100
+++ /var/tmp/diff_new_pack.AxiUze/_new 2020-12-18 19:59:49.342090306 +0100
@@ -19,7 +19,7 @@
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
Name: sapnwbootstrap-formula
-Version: 0.5.2+git.1607008280.77233b6
+Version: 0.5.2+git.1608216907.2f2ee2a
Release: 0
Summary: SAP Netweaver platform deployment formula
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.AxiUze/_old 2020-12-18 19:59:49.370090336 +0100
+++ /var/tmp/diff_new_pack.AxiUze/_new 2020-12-18 19:59:49.374090340 +0100
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">sapnwbootstrap-formula</param>
<param name="versionformat">0.5.2+git.%ct.%h</param>
- <param name="revision">77233b67b743d945425abff8925a4ce934c91586</param>
+ <param name="revision">2f2ee2a1a67642ddeb21a885332f9ce86f3d1ea7</param>
</service>
<service name="recompress" mode="disabled">
++++++ sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6.tar.gz ->
sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/ensa_version_detection.sls
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/ensa_version_detection.sls
---
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/ensa_version_detection.sls
2020-12-03 16:11:20.000000000 +0100
+++
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/ensa_version_detection.sls
2020-12-17 15:55:07.000000000 +0100
@@ -13,5 +13,7 @@
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
+ - require:
+ - netweaver_install_{{ instance_name }}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/ha_cluster.sls
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/ha_cluster.sls
---
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/ha_cluster.sls
2020-12-03 16:11:20.000000000 +0100
+++
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/ha_cluster.sls
2020-12-17 15:55:07.000000000 +0100
@@ -8,9 +8,11 @@
{% set instance_folder = node.sap_instance.upper()~instance %}
{% set profile_file =
'/usr/sap/'~node.sid.upper()~'/SYS/profile/'~node.sid.upper()~'_'~instance_folder~'_'~node.virtual_host
%}
-install_suse_connetor:
+install_suse_connector:
pkg.installed:
- name: sap-suse-cluster-connector
+ - require:
+ - netweaver_install_{{ instance_name }}
wait_until_systems_installed:
netweaver.check_instance_present:
@@ -26,6 +28,8 @@
- retry:
attempts: 20
interval: 30
+ - require:
+ - netweaver_install_{{ instance_name }}
update_sapservices_{{ instance_name }}:
netweaver.sapservices_updated:
@@ -33,6 +37,8 @@
- sid: {{ node.sid.lower() }}
- inst: {{ instance }}
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
+ - require:
+ - netweaver_install_{{ instance_name }}
stop_sap_instance_{{ instance_name }}:
module.run:
@@ -43,6 +49,8 @@
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
+ - require:
+ - netweaver_install_{{ instance_name }}
stop_sap_instance_service_{{ instance_name }}:
module.run:
@@ -53,6 +61,8 @@
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
+ - require:
+ - netweaver_install_{{ instance_name }}
add_ha_scripts_{{ instance_name }}:
file.append:
@@ -65,6 +75,8 @@
service/halib_cluster_connector = /usr/bin/sap_suse_cluster_connector
- unless:
- cat {{ profile_file }} | grep '^service/halib'
+ - require:
+ - stop_sap_instance_{{ instance_name }}
add_sapuser_to_haclient_{{ instance_name }}:
user.present:
@@ -72,6 +84,8 @@
- remove_groups: False
- groups:
- haclient
+ - require:
+ - stop_sap_instance_{{ instance_name }}
{% if node.sap_instance.lower() == 'ascs' %}
@@ -80,6 +94,8 @@
- name: {{ profile_file }}
- pattern: '^Restart_Program_01 = local \$\(_EN\) pf=\$\(_PF\)'
- repl: 'Start_Program_01 = local $(_EN) pf=$(_PF)'
+ - require:
+ - stop_sap_instance_{{ instance_name }}
set_keepalive_option_{{ instance_name }}:
file.line:
@@ -90,6 +106,8 @@
# onlyif statements can be improved when salt version 3000 is used
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#onlyif
- onlyif: cat /etc/salt/grains | grep "ensa_version_{{ node.sid.lower()
}}_{{ instance }}:.*1"
+ - require:
+ - stop_sap_instance_{{ instance_name }}
{% elif node.sap_instance.lower() == 'ers' %}
@@ -98,12 +116,16 @@
- name: {{ profile_file }}
- pattern: '^Restart_Program_00 = local \$\(_ER\) pf=\$\(_PFL\)
NR=\$\(SCSID\)'
- repl: 'Start_Program_00 = local $(_ER) pf=$(_PFL) NR=$(SCSID)'
+ - require:
+ - stop_sap_instance_{{ instance_name }}
remove_autostart_option_{{ instance_name }}:
file.line:
- name: {{ profile_file }}
- match: ^Autostart = 1.*$
- mode: delete
+ - require:
+ - stop_sap_instance_{{ instance_name }}
{% endif %}
@@ -116,6 +138,8 @@
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
+ - require:
+ - stop_sap_instance_{{ instance_name }}
start_sap_instance_{{ instance_name }}:
module.run:
@@ -126,5 +150,7 @@
- password: {{
netweaver.sid_adm_password|default(netweaver.master_password) }}
- test.sleep:
- length: 2
+ - require:
+ - stop_sap_instance_{{ instance_name }}
{% endfor %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/monitoring.sls
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/monitoring.sls
---
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/netweaver/monitoring.sls
2020-12-03 16:11:20.000000000 +0100
+++
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/netweaver/monitoring.sls
2020-12-17 15:55:07.000000000 +0100
@@ -9,6 +9,7 @@
{% for node in netweaver.nodes if node.sap_instance != "db" %}
{% set sap_instance_nr = '{:0>2}'.format(node.instance) %}
{% set exporter_instance = '{}_{}{}'.format(node.sid,
node.sap_instance.upper(), sap_instance_nr) %}
+{% set instance_name = node.sid~'_'~sap_instance_nr %}
# we bind each exporter instance to a SAP instance virtual host
sap_host_exporter_configuration_{{ exporter_instance }}:
@@ -19,6 +20,7 @@
sap-control-uds: /tmp/.sapstream5{{ sap_instance_nr }}13
- require:
- pkg: prometheus_sap_host_exporter_pkg
+ - netweaver_install_{{ instance_name }}
{% if host == node.host %}
sap_host_exporter_service_{{ exporter_instance }}:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/sapnwbootstrap-formula.changes
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/sapnwbootstrap-formula.changes
---
old/sapnwbootstrap-formula-0.5.2+git.1607008280.77233b6/sapnwbootstrap-formula.changes
2020-12-03 16:11:20.000000000 +0100
+++
new/sapnwbootstrap-formula-0.5.2+git.1608216907.2f2ee2a/sapnwbootstrap-formula.changes
2020-12-17 15:55:07.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Dec 3 16:12:08 UTC 2020 - Simranpal Singh <[email protected]>
+
+- Add requisites of netweaver installation to subsequent salt states
+
+-------------------------------------------------------------------
Wed Dec 2 18:41:35 UTC 2020 - Simranpal Singh <[email protected]>
- Start the saptune systemd service
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
