Skip to content

Commit 98b1380

Browse files
authored
Merge pull request #266319 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 264f27a + bb60947 commit 98b1380

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

articles/role-based-access-control/scope-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The scope consists of a series of identifiers separated by the slash (/) charact
4444
```
4545

4646
- `{subscriptionId}` is the ID of the subscription to use (a GUID).
47-
- `{resourcesGroupName}` is the name of the containing resource group.
47+
- `{resourceGroupName}` is the name of the containing resource group.
4848
- `{providerName}` is the name of the [resource provider](../azure-resource-manager/management/azure-services-resource-providers.md) that handles the resource, then `{resourceType}` and `{resourceSubType*}` identify further levels within that resource provider.
4949
- `{resourceName}` is the last part of the string that identifies a specific resource.
5050

articles/sap/workloads/high-availability-guide-suse-pacemaker.md

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -470,21 +470,13 @@ If you want to deploy resources by using the Azure CLI or the Azure portal, you
470470

471471
### Set up an Azure shared disk SBD device
472472

473-
1. **[A]** Install iSCSI package.
474-
475-
```bash
476-
sudo zypper install open-iscsi
477-
```
478-
479-
2. **[A]** Enable the iSCSI and SBD services.
473+
1. **[A]** Enable the SBD services.
480474

481475
```bash
482-
sudo systemctl enable iscsid
483-
sudo systemctl enable iscsi
484476
sudo systemctl enable sbd
485477
```
486478

487-
3. **[A]** Make sure that the attached disk is available.
479+
2. **[A]** Make sure that the attached disk is available.
488480

489481
```bash
490482
# lsblk
@@ -507,7 +499,7 @@ If you want to deploy resources by using the Azure CLI or the Azure portal, you
507499
[5:0:0:0] disk Msft Virtual Disk 1.0 /dev/sdc
508500
```
509501

510-
4. **[A]** Retrieve the IDs of the attached disks.
502+
3. **[A]** Retrieve the IDs of the attached disks.
511503

512504
```bash
513505
# ls -l /dev/disk/by-id/scsi-* | grep sdc
@@ -517,15 +509,15 @@ If you want to deploy resources by using the Azure CLI or the Azure portal, you
517509

518510
The commands list device IDs for the SBD device. We recommend using the ID that starts with scsi-3. In the preceding example, the ID is **/dev/disk/by-id/scsi-3600224804208a67da8073b2a9728af19**.
519511

520-
5. **[1]** Create the SBD device.
512+
4. **[1]** Create the SBD device.
521513

522514
Use the device ID from step 2 to create the new SBD devices on the first cluster node.
523515

524516
```bash
525517
# sudo sbd -d /dev/disk/by-id/scsi-3600224804208a67da8073b2a9728af19 -1 60 -4 120 create
526518
```
527519

528-
6. **[A]** Adapt the SBD configuration.
520+
5. **[A]** Adapt the SBD configuration.
529521

530522
a. Open the SBD config file.
531523

@@ -548,13 +540,13 @@ If you want to deploy resources by using the Azure CLI or the Azure portal, you
548540
> [!NOTE]
549541
> If the SBD_DELAY_START property value is set to "no", change the value to "yes". You must also check the SBD service file to ensure that the value of TimeoutStartSec is greater than the value of SBD_DELAY_START. For more information, see [SBD file configuraton](https://documentation.suse.com/sle-ha/15-SP5/html/SLE-HA-all/cha-ha-storage-protect.html#pro-ha-storage-protect-sbd-config)
550542

551-
7. Create the `softdog` configuration file.
543+
6. Create the `softdog` configuration file.
552544

553545
```bash
554546
echo softdog | sudo tee /etc/modules-load.d/softdog.conf
555547
```
556548

557-
8. Load the module.
549+
7. Load the module.
558550

559551
```bash
560552
sudo modprobe -v softdog

0 commit comments

Comments
 (0)