Merge pull request sap-linuxlab#725 from marcelmamula/simple-mount

sap_ha_pacemaker_cluster: ASCS ERS Simple Mount
berndfinger · Jun 5, 2024 · ef06363 · ef06363
2 parents 54aa486 + 2ab9439
commit ef06363
Show file tree

Hide file tree

Showing 13 changed files with 687 additions and 69 deletions.
diff --git a/roles/sap_ha_pacemaker_cluster/README.md b/roles/sap_ha_pacemaker_cluster/README.md
@@ -322,6 +322,20 @@ Inherits the value of `ha_cluster_hacluster_password`, when defined.<br>
 Parameter for the 'SAPHana' cluster resource.<br>
 Define if a former primary should be re-registered automatically as secondary.<br>
 
+### sap_ha_pacemaker_cluster_hana_colocation_hana_vip_primary_name
+
+- _Type:_ `string`
+- _Default:_ `col_saphana_vip_<SID>_HDB<Instance Number>_primary`
+
+Customize the cluster constraint name for VIP and SAPHana primary clone colocation.<br>
+
+### sap_ha_pacemaker_cluster_hana_colocation_hana_vip_secondary_name
+
+- _Type:_ `string`
+- _Default:_ `col_saphana_vip_<SID>_HDB<Instance Number>_readonly`
+
+Customize the cluster constraint name for VIP and SAPHana secondary clone colocation.<br>
+
 ### sap_ha_pacemaker_cluster_hana_duplicate_primary_timeout
 
 - _Type:_ `int`
@@ -410,6 +424,27 @@ The instance number of the SAP HANA database which this role will configure in t
 Inherits the value of `sap_hana_instance_number`, when defined.<br>
 Mandatory for SAP HANA cluster setups.<br>
 
+### sap_ha_pacemaker_cluster_hana_order_hana_vip_primary_name
+
+- _Type:_ `string`
+- _Default:_ `ord_saphana_vip_<SID>_HDB<Instance Number>_primary`
+
+Customize the cluster constraint name for VIP and SAPHana primary clone order.<br>
+
+### sap_ha_pacemaker_cluster_hana_order_hana_vip_secondary_name
+
+- _Type:_ `string`
+- _Default:_ `ord_saphana_vip_<SID>_HDB<Instance Number>_readonly`
+
+Customize the cluster constraint name for VIP and SAPHana secondary clone order.<br>
+
+### sap_ha_pacemaker_cluster_hana_order_topology_hana_name
+
+- _Type:_ `string`
+- _Default:_ `ord_saphana_saphanatop_<SID>_HDB<Instance Number>`
+
+Customize the cluster constraint name for SAPHana and Topology order.<br>
+
 ### sap_ha_pacemaker_cluster_hana_prefer_site_takeover
 
 - _Type:_ `bool`
@@ -551,6 +586,14 @@ Mandatory for NetWeaver AAS cluster configuration.<br>
 The standard NetWeaver ASCS/ERS cluster will be set up as ENSA2.<br>
 Set this parameter to 'true' to configure it as ENSA1.<br>
 
+### sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_simple_mount
+
+- _Type:_ `bool`
+- _Default:_ `True`
+
+Enables preferred method for ASCS ERS ENSA2 clusters - Simple Mount<br>
+Set this parameter to 'true' to configure ENSA2 Simple Mount.<br>
+
 ### sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name
 
 - _Type:_ `string`
@@ -601,6 +644,7 @@ Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ens
 
 The name of the ASCS instance, typically the profile name.<br>
 Mandatory for the NetWeaver ASCS/ERS cluster setup<br>
+Recommended format <SID>_ASCS<ASCS-instance-number>_<ASCS-hostname>.<br>
 
 ### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name
 
@@ -623,6 +667,13 @@ NetWeaver ASCS instance resource stickiness attribute.<br>
 The full path and name of the ASCS instance profile.<br>
 Mandatory for the NetWeaver ASCS/ERS cluster setup.<br>
 
+### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapstartsrv_resource_name
+
+- _Type:_ `string`
+- _Default:_ `rsc_SAPStartSrv_<SID>_ASCS<ASCS-instance-number>`
+
+Name of the ASCS SAPStartSrv resource for simple mount.<br>
+
 ### sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name
 
 - _Type:_ `string`
@@ -650,6 +701,7 @@ NetWeaver ERS instance resource option "AUTOMATIC_RECOVER".<br>
 
 The name of the ERS instance, typically the profile name.<br>
 Mandatory for the NetWeaver ASCS/ERS cluster setup.<br>
+Recommended format <SID>_ERS<ERS-instance-number>_<ERS-hostname>.<br>
 
 ### sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name
 
@@ -665,6 +717,13 @@ Name of the ERS instance resource.<br>
 The full path and name of the ERS instance profile.<br>
 Mandatory for the NetWeaver ASCS/ERS cluster.<br>
 
+### sap_ha_pacemaker_cluster_nwas_abap_ers_sapstartsrv_resource_name
+
+- _Type:_ `string`
+- _Default:_ `rsc_SAPStartSrv_<SID>_ERS<ERS-instance-number>`
+
+Name of the ERS SAPstartSrv resource for simple mount.<br>
+
 ### sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr
 
 - _Type:_ `string`
@@ -681,6 +740,20 @@ Mandatory for NetWeaver cluster configuration.<br>
 Uses `sap_swpm_sid` if defined.<br>
 Mandatory for NetWeaver cluster setups.<br>
 
+### sap_ha_pacemaker_cluster_nwas_colocation_ascs_no_ers_name
+
+- _Type:_ `string`
+- _Default:_ `col_ascs_separate_<SID>`
+
+Customize the cluster constraint name for ASCS and ERS separation colocation.<br>
+
+### sap_ha_pacemaker_cluster_nwas_order_ascs_first_name
+
+- _Type:_ `string`
+- _Default:_ `ord_ascs_first_<SID>`
+
+Customize the cluster constraint name for ASCS starting before ERS order.<br>
+
 ### sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_clone_name
 
 - _Type:_ `string`

diff --git a/roles/sap_ha_pacemaker_cluster/defaults/main.yml b/roles/sap_ha_pacemaker_cluster/defaults/main.yml
@@ -135,6 +135,20 @@ sap_ha_pacemaker_cluster_hana_filesystem_resource_name: >-
 sap_ha_pacemaker_cluster_hana_filesystem_resource_clone_name: >-
   cln_SAPHanaFil_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}
 
+# SAP HANA - Constraint names
+sap_ha_pacemaker_cluster_hana_order_topology_hana_name: >-
+  ord_saphana_saphanatop_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}
+
+sap_ha_pacemaker_cluster_hana_colocation_hana_vip_primary_name: >-
+  col_saphana_vip_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}_primary
+sap_ha_pacemaker_cluster_hana_colocation_hana_vip_secondary_name: >-
+  col_saphana_vip_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}_readonly
+
+sap_ha_pacemaker_cluster_hana_order_hana_vip_primary_name: >-
+  ord_saphana_vip_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}_primary
+sap_ha_pacemaker_cluster_hana_order_hana_vip_secondary_name: >-
+  ord_saphana_vip_{{ sap_ha_pacemaker_cluster_hana_sid }}_HDB{{ sap_ha_pacemaker_cluster_hana_instance_nr }}_readonly
+
 # Multiple VIP parameters can be defined and will be combined.
 # See tasks/include_construct_vip_resources.yml
 #
@@ -172,6 +186,9 @@ sap_ha_pacemaker_cluster_hana_global_ini_path: "/usr/sap/{{
 # set this parameter to 'true'.
 sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1: false
 
+# Enable ENSA2 simple mount configuration
+sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_simple_mount: true
+
 # Enable/Disable sap_cluster_connector.
 # Ref.: https://access.redhat.com/solutions/3606101
 sap_ha_pacemaker_cluster_enable_cluster_connector: true
@@ -239,12 +256,6 @@ sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_clone_name: >-
 # Set this parameter to "true" to configure the 3 shared filesystems as part of the cluster.
 sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed: false
 
-# SAP NetWeaver resource group names as convenience parameters
-sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_group_name: >-
-  grp_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
-sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_group_name: >-
-  grp_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}
-
 ################################################################################
 # ASCS resource defaults
 ################################################################################
@@ -262,7 +273,18 @@ sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name: >-
   rsc_fs_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
 sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name: >-
   rsc_SAPInstance_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
-# sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name }}-clone"
+sap_ha_pacemaker_cluster_nwas_abap_ascs_sapstartsrv_resource_name: >-
+  rsc_SAPStartSrv_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
+
+sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_group_name: >-
+  grp_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
+
+sap_ha_pacemaker_cluster_nwas_colocation_ascs_no_ers_name: >-
+  col_ascs_separate_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}
+
+sap_ha_pacemaker_cluster_nwas_order_ascs_first_name: >-
+  ord_ascs_first_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}
+
 sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_automatic_recover_bool: false
 sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_stickiness: 5000
 sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_migration_threshold: 1
@@ -281,13 +303,18 @@ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name: ''
 # Full path with instance profile name - mandatory to be user-defined
 sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string: ''
 
+# SAP NetWeaver ABAP ERS - Resource IDs (names) as convenience parameters.
 sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name: >-
-  rsc_fs_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
+  rsc_fs_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}
 sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name: >-
-  rsc_SAPInstance_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}
-# sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name }}-clone"
+  rsc_SAPInstance_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}
+sap_ha_pacemaker_cluster_nwas_abap_ers_sapstartsrv_resource_name: >-
+  rsc_SAPStartSrv_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}
 sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool: false
 
+sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_group_name: >-
+  grp_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}
+
 
 ################################################################################
 # PAS/AAS resource defaults

diff --git a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml
@@ -352,6 +352,11 @@ argument_specs:
         description:
           - Customize the cluster resource name of the SAP HANA Filesystem clone.
 
+      sap_ha_pacemaker_cluster_hana_order_topology_hana_name:
+        default: "ord_saphana_saphanatop_<SID>_HDB<Instance Number>"
+        description:
+          - Customize the cluster constraint name for SAPHana and Topology order.
+
       sap_ha_pacemaker_cluster_vip_hana_primary_ip_address:
         description:
           - The virtual IP of the primary HANA instance.
@@ -373,6 +378,26 @@ argument_specs:
           - Customize the name of the resource managing the Virtual IP of read-only access to the
             secondary HANA instance.
 
+      sap_ha_pacemaker_cluster_hana_order_hana_vip_primary_name:
+        default: "ord_saphana_vip_<SID>_HDB<Instance Number>_primary"
+        description:
+          - Customize the cluster constraint name for VIP and SAPHana primary clone order.
+
+      sap_ha_pacemaker_cluster_hana_order_hana_vip_secondary_name:
+        default: "ord_saphana_vip_<SID>_HDB<Instance Number>_readonly"
+        description:
+          - Customize the cluster constraint name for VIP and SAPHana secondary clone order.
+
+      sap_ha_pacemaker_cluster_hana_colocation_hana_vip_primary_name:
+        default: "col_saphana_vip_<SID>_HDB<Instance Number>_primary"
+        description:
+          - Customize the cluster constraint name for VIP and SAPHana primary clone colocation.
+
+      sap_ha_pacemaker_cluster_hana_colocation_hana_vip_secondary_name:
+        default: "col_saphana_vip_<SID>_HDB<Instance Number>_readonly"
+        description:
+          - Customize the cluster constraint name for VIP and SAPHana secondary clone colocation.
+
       sap_ha_pacemaker_cluster_hana_hooks:
         type: list
         default: []
@@ -425,6 +450,13 @@ argument_specs:
       # NetWeaver specific parameters
       ##########################################################################
 
+      sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_simple_mount:
+        type: bool
+        default: true
+        description:
+          - Enables preferred method for ASCS ERS ENSA2 clusters - Simple Mount
+          - Set this parameter to 'true' to configure ENSA2 Simple Mount.
+
       sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1:
         type: bool
         default: false
@@ -603,16 +635,6 @@ argument_specs:
           - Change this parameter to 'true' if the 3 shared filesystems `/usr/sap/trans`,
             `/usr/sap/<SID>/SYS` and '/sapmnt' shall be configured as cloned cluster resources.
 
-      sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_group_name:
-        default: grp_<SID>_ASCS<ASCS-instance-number>
-        description:
-          - Name of the NetWeaver ASCS resource group.
-
-      sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_group_name:
-        default: grp_<SID>_ERS<ERS-instance-number>
-        description:
-          - Name of the NetWeaver ERS resource group.
-
       ##########################################################################
       # NetWeaver ASCS specific parameters
       ##########################################################################
@@ -621,6 +643,7 @@ argument_specs:
         description:
           - The name of the ASCS instance, typically the profile name.
           - Mandatory for the NetWeaver ASCS/ERS cluster setup
+          - Recommended format <SID>_ASCS<ASCS-instance-number>_<ASCS-hostname>.
 
       sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string:
         description:
@@ -637,6 +660,26 @@ argument_specs:
         description:
           - Name of the ASCS instance resource.
 
+      sap_ha_pacemaker_cluster_nwas_abap_ascs_sapstartsrv_resource_name:
+        default: rsc_SAPStartSrv_<SID>_ASCS<ASCS-instance-number>
+        description:
+          - Name of the ASCS SAPStartSrv resource for simple mount.
+
+      sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_group_name:
+        default: grp_<SID>_ASCS<ASCS-instance-number>
+        description:
+          - Name of the NetWeaver ASCS resource group.
+
+      sap_ha_pacemaker_cluster_nwas_colocation_ascs_no_ers_name:
+        default: "col_ascs_separate_<SID>"
+        description:
+          - Customize the cluster constraint name for ASCS and ERS separation colocation.
+
+      sap_ha_pacemaker_cluster_nwas_order_ascs_first_name:
+        default: "ord_ascs_first_<SID>"
+        description:
+          - Customize the cluster constraint name for ASCS starting before ERS order.
+
       sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_automatic_recover_bool:
         type: bool
         default: false
@@ -677,6 +720,7 @@ argument_specs:
         description:
           - The name of the ERS instance, typically the profile name.
           - Mandatory for the NetWeaver ASCS/ERS cluster setup.
+          - Recommended format <SID>_ERS<ERS-instance-number>_<ERS-hostname>.
 
       sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string:
         description:
@@ -699,6 +743,15 @@ argument_specs:
         description:
           - Name of the ERS instance resource.
 
+      sap_ha_pacemaker_cluster_nwas_abap_ers_sapstartsrv_resource_name:
+        default: rsc_SAPStartSrv_<SID>_ERS<ERS-instance-number>
+        description:
+          - Name of the ERS SAPstartSrv resource for simple mount.
+
+      sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_group_name:
+        default: grp_<SID>_ERS<ERS-instance-number>
+        description:
+          - Name of the NetWeaver ERS resource group.
 
       ##########################################################################
       # PAS specific parameters