Skip to content

Commit 3d854c7

Browse files
committed
resolving merge conflict
1 parent 0b722a1 commit 3d854c7

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ To create a managed identity (MSI), [create a system-assigned](/azure/active-dir
237237
### Using Service Principal
238238
Follow these steps to create a service principal, if not using managed identity.
239239

240-
1. Go to [Azure portal](https://portal.azure.com).
240+
1. Go to the [Azure portal](https://portal.azure.com).
241241
1. Open the Azure Active Directory blade
242242
Go to Properties and make a note of the Directory ID. This is the **tenant ID**.
243243
1. Click App registrations

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,6 @@ Make sure to assign the custom role to the service principal at all VM (cluster
637637
>[!IMPORTANT]
638638
> The installed version of the *fence-agents* package must be 4.4.0 or later to benefit from the faster failover times with the Azure fence agent, when a cluster node is fenced. If you're running an earlier version, we recommend that you update the package.
639639
640-
>[!IMPORTANT]
641-
> If using managed identity, the installed version of the *fence-agents* package must be fence-agents 4.5.2+git.1592573838.1eee0863 or later. Earlier versions will not work correctly with a managed identity configuration.
642-
> Currently only SLES 15 SP1 and older are supported for managed identity configuration.
643-
644640
1. **[A]** Install the Azure Python SDK and Azure Identity Python module.
645641

646642
Install the Azure Python SDK on SLES 12 SP4 or SLES 12 SP5:

0 commit comments

Comments
 (0)