Skip to content

Commit 310635d

Browse files
authored
Merge pull request #26 from arbulu89/hotfix/fix-ascs-restart
Hotfix/fix ascs restart
2 parents 9447148 + 58cb753 commit 310635d

3 files changed

Lines changed: 37 additions & 1 deletion

File tree

netweaver/setup/shared_disk.sls

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,28 @@ second_partition:
2727
- require:
2828
- label_partition
2929

30+
# This state is done to avoid failure in disk formatting
31+
wait_until_partition:
32+
module.run:
33+
- test.sleep:
34+
- length: 5
35+
- require:
36+
- sbd_partition
37+
- first_partition
38+
- second_partition
39+
3040
format_first_partition:
3141
cmd.run:
3242
- name: /sbin/mkfs.xfs {{ node.shared_disk_dev }}2
3343
- require:
44+
- wait_until_partition
3445
- first_partition
3546

3647
format_second_partition:
3748
cmd.run:
3849
- name: /sbin/mkfs.xfs {{ node.shared_disk_dev }}3
3950
- require:
51+
- wait_until_partition
4052
- second_partition
4153

4254
{% else %}
@@ -48,5 +60,22 @@ rescan_partition:
4860
- hide_output: True
4961
- timeout: 6000
5062

63+
# This state is done to give always time to the disk formatting done by the 1st node
64+
wait_until_rescan:
65+
module.run:
66+
- test.sleep:
67+
- length: 10
68+
- require:
69+
- rescan_partition
70+
71+
rescan_after_formatting:
72+
cmd.run:
73+
- name: partprobe; fdisk -l {{ node.shared_disk_dev }}
74+
- output_loglevel: quiet
75+
- hide_output: True
76+
- timeout: 6000
77+
- require:
78+
- wait_until_rescan
79+
5180
{% endif %}
5281
{% endfor %}

sapnwbootstrap-formula.changes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
-------------------------------------------------------------------
2+
Mon Jan 20 13:48:38 UTC 2020 - Xabier Arbulu <xarbulu@suse.com>
3+
4+
- Version bump 0.1.9
5+
* Improve the shared disk creation to avoid issues mounting and
6+
formatting the partitions (and later on with SAP instances)
7+
18
-------------------------------------------------------------------
29
Thu Dec 19 12:19:23 UTC 2019 - Xabier Arbulu <xarbulu@suse.com>
310

sapnwbootstrap-formula.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
2020

2121
Name: sapnwbootstrap-formula
22-
Version: 0.1.8
22+
Version: 0.1.9
2323
Release: 0
2424
Summary: SAP Netweaver platform deployment formula
2525
License: Apache-2.0

0 commit comments

Comments
 (0)