Skip to content

Commit a8e16ab

Browse files
authored
Merge pull request #185956 from rdeltcheva/cidr-sles
remove cidr_netmask config and allow the RA to determine automatically
2 parents 6a53a17 + b4d7651 commit a8e16ab

5 files changed

+19
-21
lines changed

articles/virtual-machines/workloads/sap/high-availability-guide-suse-multi-sid.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.service: virtual-machines-sap
99
ms.topic: article
1010
ms.tgt_pltfrm: vm-windows
1111
ms.workload: infrastructure-services
12-
ms.date: 10/16/2020
12+
ms.date: 01/24/2022
1313
ms.author: radeltch
1414
---
1515

@@ -256,7 +256,7 @@ This documentation assumes that:
256256
op monitor interval=20s timeout=40s
257257
258258
sudo crm configure primitive vip_NW2_ASCS IPaddr2 \
259-
params ip=10.3.1.16 cidr_netmask=24 \
259+
params ip=10.3.1.16 \
260260
op monitor interval=10 timeout=20
261261
262262
sudo crm configure primitive nc_NW2_ASCS azure-lb port=62010
@@ -270,7 +270,7 @@ This documentation assumes that:
270270
op monitor interval=20s timeout=40s
271271
272272
sudo crm configure primitive vip_NW3_ASCS IPaddr2 \
273-
params ip=10.3.1.13 cidr_netmask=24 \
273+
params ip=10.3.1.13 \
274274
op monitor interval=10 timeout=20
275275
276276
sudo crm configure primitive nc_NW3_ASCS azure-lb port=62020
@@ -302,7 +302,7 @@ This documentation assumes that:
302302
op monitor interval=20s timeout=40s
303303

304304
sudo crm configure primitive vip_NW2_ERS IPaddr2 \
305-
params ip=10.3.1.17 cidr_netmask=24 \
305+
params ip=10.3.1.17 \
306306
op monitor interval=10 timeout=20
307307

308308
sudo crm configure primitive nc_NW2_ERS azure-lb port=62112
@@ -315,7 +315,7 @@ This documentation assumes that:
315315
op monitor interval=20s timeout=40s
316316

317317
sudo crm configure primitive vip_NW3_ERS IPaddr2 \
318-
params ip=10.3.1.19 cidr_netmask=24 \
318+
params ip=10.3.1.19 \
319319
op monitor interval=10 timeout=20
320320

321321
sudo crm configure primitive nc_NW3_ERS azure-lb port=62122

articles/virtual-machines/workloads/sap/high-availability-guide-suse-netapp-files.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.service: virtual-machines-sap
1313
ms.topic: article
1414
ms.tgt_pltfrm: vm-windows
1515
ms.workload: infrastructure-services
16-
ms.date: 12/07/2021
16+
ms.date: 01/24/2022
1717
ms.author: radeltch
1818

1919
---
@@ -523,7 +523,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
523523
op monitor interval=20s timeout=40s
524524
525525
sudo crm configure primitive vip_<b>QAS</b>_ASCS IPaddr2 \
526-
params ip=<b>10.1.1.20</b> cidr_netmask=<b>24</b> \
526+
params ip=<b>10.1.1.20</b> \
527527
op monitor interval=10 timeout=20
528528
529529
sudo crm configure primitive nc_<b>QAS</b>_ASCS azure-lb port=620<b>00</b>
@@ -582,7 +582,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
582582
op monitor interval=20s timeout=40s
583583
584584
sudo crm configure primitive vip_<b>QAS</b>_ERS IPaddr2 \
585-
params ip=<b>10.1.1.21</b> cidr_netmask=<b>24</b> \
585+
params ip=<b>10.1.1.21</b> \
586586
op monitor interval=10 timeout=20
587587
588588
sudo crm configure primitive nc_<b>QAS</b>_ERS azure-lb port=621<b>01</b>

articles/virtual-machines/workloads/sap/high-availability-guide-suse-nfs-azure-files.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.service: virtual-machines-sap
1313
ms.topic: tutorial
1414
ms.tgt_pltfrm: vm-windows
1515
ms.workload: infrastructure-services
16-
ms.date: 12/07/2021
16+
ms.date: 01/24/2022
1717
ms.author: radeltch
1818

1919
---
@@ -450,7 +450,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
450450
op monitor interval=20s timeout=40s
451451
452452
sudo crm configure primitive vip_NW1_ASCS IPaddr2 \
453-
params ip=10.90.90.10 cidr_netmask=24 \
453+
params ip=10.90.90.10 \
454454
op monitor interval=10 timeout=20
455455
456456
sudo crm configure primitive nc_NW1_ASCS azure-lb port=62000
@@ -504,7 +504,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
504504
op monitor interval=20s timeout=40s
505505
506506
sudo crm configure primitive vip_NW1_ERS IPaddr2 \
507-
params ip=10.90.90.9 cidr_netmask=24 \
507+
params ip=10.90.90.9 \
508508
op monitor interval=10 timeout=20
509509
510510
sudo crm configure primitive nc_NW1_ERS azure-lb port=62101

articles/virtual-machines/workloads/sap/high-availability-guide-suse-nfs.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.service: virtual-machines-sap
1212
ms.topic: article
1313
ms.tgt_pltfrm: vm-windows
1414
ms.workload: infrastructure-services
15-
ms.date: 04/12/2021
15+
ms.date: 01/24/2022
1616
ms.author: radeltch
1717

1818
---
@@ -518,9 +518,8 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
518518
params directory="/srv/nfs/<b>NW1</b>" \
519519
options="rw,no_root_squash,crossmnt" clientspec="*" fsid=1 wait_for_leasetime_on_stop=true op monitor interval="30s"
520520

521-
sudo crm configure primitive vip_<b>NW1</b>_nfs \
522-
IPaddr2 \
523-
params ip=<b>10.0.0.4</b> cidr_netmask=<b>24</b> op monitor interval=10 timeout=20
521+
sudo crm configure primitive vip_<b>NW1</b>_nfs IPaddr2 \
522+
params ip=<b>10.0.0.4</b> op monitor interval=10 timeout=20
524523

525524
sudo crm configure primitive nc_<b>NW1</b>_nfs azure-lb port=<b>61000</b>
526525

@@ -561,9 +560,8 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
561560
params directory="/srv/nfs/<b>NW2</b>" \
562561
options="rw,no_root_squash,crossmnt" clientspec="*" fsid=2 wait_for_leasetime_on_stop=true op monitor interval="30s"
563562

564-
sudo crm configure primitive vip_<b>NW2</b>_nfs \
565-
IPaddr2 \
566-
params ip=<b>10.0.0.5</b> cidr_netmask=<b>24</b> op monitor interval=10 timeout=20
563+
sudo crm configure primitive vip_<b>NW2</b>_nfs IPaddr2 \
564+
params ip=<b>10.0.0.5</b> op monitor interval=10 timeout=20
567565

568566
sudo crm configure primitive nc_<b>NW2</b>_nfs azure-lb port=<b>61001</b>
569567

articles/virtual-machines/workloads/sap/high-availability-guide-suse.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.service: virtual-machines-sap
1313
ms.topic: article
1414
ms.tgt_pltfrm: vm-windows
1515
ms.workload: infrastructure-services
16-
ms.date: 12/07/2021
16+
ms.date: 01/24/2022
1717
ms.author: radeltch
1818

1919
---
@@ -421,7 +421,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
421421
op monitor interval=20s timeout=40s
422422

423423
sudo crm configure primitive vip_<b>NW1</b>_ASCS IPaddr2 \
424-
params ip=<b>10.0.0.7</b> cidr_netmask=<b>24</b> \
424+
params ip=<b>10.0.0.7</b> \
425425
op monitor interval=10 timeout=20
426426

427427
sudo crm configure primitive nc_<b>NW1</b>_ASCS azure-lb port=620<b>00</b>
@@ -472,7 +472,7 @@ The following items are prefixed with either **[A]** - applicable to all nodes,
472472
op monitor interval=20s timeout=40s
473473

474474
sudo crm configure primitive vip_<b>NW1</b>_ERS IPaddr2 \
475-
params ip=<b>10.0.0.8</b> cidr_netmask=<b>24</b> \
475+
params ip=<b>10.0.0.8</b> \
476476
op monitor interval=10 timeout=20
477477

478478
sudo crm configure primitive nc_<b>NW1</b>_ERS azure-lb port=621<b>02</b>

0 commit comments

Comments
 (0)