From a0e921d10ba47ae4b336f751ee522ab12681a312 Mon Sep 17 00:00:00 2001 From: Janine Fuchs Date: Wed, 27 Sep 2023 14:48:18 +0200 Subject: [PATCH 1/2] sap_ha_pacemaker_cluster: default adjusted to actual default --- roles/sap_ha_pacemaker_cluster/README.md | 2 +- roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/sap_ha_pacemaker_cluster/README.md b/roles/sap_ha_pacemaker_cluster/README.md index f26e5a3e7..825374cfe 100644 --- a/roles/sap_ha_pacemaker_cluster/README.md +++ b/roles/sap_ha_pacemaker_cluster/README.md @@ -222,7 +222,7 @@ sap_ha_pacemaker_cluster_cluster_properties: ### sap_ha_pacemaker_cluster_create_config_dest - _Type:_ `string` -- _Default:_ `_resource_config.yml` +- _Default:_ `review_resource_config.yml` The pacemaker cluster resource configuration optionally created by this role will be saved in a Yaml file in the current working directory.
Requires `sap_ha_pacemaker_cluster_create_config_varfile` to be enabled for generating the output file.
diff --git a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml index 84ff1487b..4449754e4 100644 --- a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml +++ b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml @@ -38,7 +38,7 @@ argument_specs: - For RHEL System Roles for SAP, or Red Hat Automation Hub, use 'redhat.rhel_system_roles'. sap_ha_pacemaker_cluster_create_config_dest: - default: _resource_config.yml + default: review_resource_config.yml description: - The pacemaker cluster resource configuration optionally created by this role will be saved in a Yaml file in the current working directory. - Requires `sap_ha_pacemaker_cluster_create_config_varfile` to be enabled for generating the output file. From 856d0004d2eefdf746f4981319e068de3ffc69f5 Mon Sep 17 00:00:00 2001 From: Janine Fuchs Date: Thu, 28 Sep 2023 14:22:48 +0200 Subject: [PATCH 2/2] sap_ha_pacemaker_cluster: variable and file name adjustments --- ...ample-sap-nwas-ascs-ers-2-node-cluster.yml | 20 ++-- roles/sap_ha_pacemaker_cluster/README.md | 103 ++++++++---------- .../defaults/main.yml | 101 ++++++++--------- .../meta/argument_specs.yml | 84 +++++++------- .../tasks/ascertain_sap_landscape.yml | 2 +- ...figure_nwas_ascs_ers_postinstallation.yml} | 68 ++++++------ .../tasks/construct_final_hacluster_vars.yml | 6 +- .../tasks/construct_vars_common.yml | 8 +- ... => construct_vars_nwas_abap_ascs_ers.yml} | 96 ++++++++-------- ...l => construct_vars_nwas_abap_pas_aas.yml} | 52 ++++----- ...mon.yml => construct_vars_nwas_common.yml} | 26 ++--- ...l => construct_vars_nwas_java_scs_ers.yml} | 64 +++++------ .../import_hacluster_vars_from_inventory.yml | 2 +- .../tasks/include_construct_vip_resources.yml | 8 +- ...rs_netweaver.yml => include_vars_nwas.yml} | 0 roles/sap_ha_pacemaker_cluster/tasks/main.yml | 10 +- ...ct_vars_vip_resources_cloud_msazure_vm.yml | 2 +- .../tasks/validate_input_parameters.yml | 38 +++---- roles/sap_ha_pacemaker_cluster/vars/main.yml | 2 +- .../vars/nwas_abap_ascs_ers.yml | 17 ++- .../sap_ha_pacemaker_cluster/vars/redhat.yml | 2 +- roles/sap_ha_pacemaker_cluster/vars/suse.yml | 2 +- 22 files changed, 349 insertions(+), 364 deletions(-) rename roles/sap_ha_pacemaker_cluster/tasks/{configure_netweaver_ascs_ers_postinstallation.yml => configure_nwas_ascs_ers_postinstallation.yml} (70%) rename roles/sap_ha_pacemaker_cluster/tasks/{construct_vars_netweaver_abap_ascs_ers.yml => construct_vars_nwas_abap_ascs_ers.yml} (73%) rename roles/sap_ha_pacemaker_cluster/tasks/{construct_vars_netweaver_abap_pas_aas.yml => construct_vars_nwas_abap_pas_aas.yml} (66%) rename roles/sap_ha_pacemaker_cluster/tasks/{construct_vars_netweaver_common.yml => construct_vars_nwas_common.yml} (83%) rename roles/sap_ha_pacemaker_cluster/tasks/{construct_vars_netweaver_java_scs_ers.yml => construct_vars_nwas_java_scs_ers.yml} (72%) rename roles/sap_ha_pacemaker_cluster/tasks/{include_vars_netweaver.yml => include_vars_nwas.yml} (100%) diff --git a/playbooks/sample-sap-nwas-ascs-ers-2-node-cluster.yml b/playbooks/sample-sap-nwas-ascs-ers-2-node-cluster.yml index 4d97ea022..0a2d80c35 100644 --- a/playbooks/sample-sap-nwas-ascs-ers-2-node-cluster.yml +++ b/playbooks/sample-sap-nwas-ascs-ers-2-node-cluster.yml @@ -33,7 +33,7 @@ # However, for convenience it is defined along with the rest of the mandatory # parameters in this example. sap_ha_pacemaker_cluster_cluster_name: ascs-ers-cluster - sap_ha_pacemaker_cluster_hacluster_password: my-hacluster-vault-password + sap_ha_pacemaker_cluster_hacluster_user_password: my-hacluster-vault-password ### NetWeaver specific definitions sap_ha_pacemaker_cluster_storage_nfs_server: "nfs-server1.example.com:/" @@ -56,16 +56,16 @@ nfs_server: "{{ sap_ha_pacemaker_cluster_storage_nfs_server }}" # SID and Instance Numbers for ASCS and ERS. - sap_ha_pacemaker_cluster_netweaver_sid: ABC - sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number: "02" - sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number: "12" + sap_ha_pacemaker_cluster_nwas_abap_sid: ABC + sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr: "02" + sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr: "12" # Profile name created by the installer, for example: _ASCS_ - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name: ABC_ASCS02_ascs-node-ha - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string: /sapmnt/ABC/profile/ABC_ASCS02_ascs-node-ha + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name: ABC_ASCS02_ascs-node-ha + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string: /sapmnt/ABC/profile/ABC_ASCS02_ascs-node-ha - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name: ABC_ERS12_ers-node-ha - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string: /sapmnt/ABC/profile/ABC_ERS12_ers-node-ha + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name: ABC_ERS12_ers-node-ha + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string: /sapmnt/ABC/profile/ABC_ERS12_ers-node-ha # Required to go through the configuration flow for a NetWeaver ASCS/ERS cluster. sap_ha_pacemaker_cluster_host_type: @@ -73,8 +73,8 @@ # Virtual IP addresses, one per instance. # These IPs will switch between the nodes together with the instance. - sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address: 192.168.10.102 - sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address: 192.168.10.112 + sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: 192.168.10.102 + sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: 192.168.10.112 roles: diff --git a/roles/sap_ha_pacemaker_cluster/README.md b/roles/sap_ha_pacemaker_cluster/README.md index 825374cfe..ca8e6e500 100644 --- a/roles/sap_ha_pacemaker_cluster/README.md +++ b/roles/sap_ha_pacemaker_cluster/README.md @@ -133,7 +133,7 @@ Red Hat for SAP Community of Practice, Janine Fuchs, IBM Lab for SAP Solutions Minimum required parameters for all clusters: -- [sap_ha_pacemaker_cluster_hacluster_password](#sap_ha_pacemaker_cluster_hacluster_password) +- [sap_ha_pacemaker_cluster_hacluster_user_password](#sap_ha_pacemaker_cluster_hacluster_user_password) Additional minimum requirements depend on the type of cluster setup and on the target platform. @@ -321,7 +321,7 @@ sap_ha_pacemaker_cluster_ha_cluster: node_name: nodeA ``` -### sap_ha_pacemaker_cluster_hacluster_password required +### sap_ha_pacemaker_cluster_hacluster_user_password required - _Type:_ `string` @@ -458,191 +458,184 @@ Mandatory for the cluster setup on MS Azure instances.
Subscription ID of the MS Azure environment containing the target instances.
Mandatory for the cluster setup on MS Azure instances.
-### sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number +### sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr - _Type:_ `string` Instance number of the NetWeaver ABAP AAS instance.
Mandatory for NetWeaver AAS cluster configuration.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_filesystems +### sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1 -- _Type:_ `list` -- _Default:_ `['/ASCS', '/ERS']` +- _Type:_ `bool` +- _Default:_ `False` -Standard NetWeaver paths in "/usr/sap" and automatically appended to the configuration, when "/usr/sap" is in the list of `sap_ha_pacemaker_cluster_storage_definition`.
+The standard NetWeaver ASCS/ERS cluster will be set up as ENSA2.
+Set this parameter to 'true' to configure it as ENSA1.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_filesystem_resource_name +### sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name - _Type:_ `string` - _Default:_ `Filesystem_NWAS_ABAP_ASCS__` Name of the filesystem resource for the ASCS instance.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_group_stickiness +### sap_ha_pacemaker_cluster_nwas_abap_ascs_group_stickiness - _Type:_ `string` - _Default:_ `3000` NetWeaver ASCS resource group stickiness to prefer the ASCS group to stay on the node it was started on.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number +### sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr - _Type:_ `string` Instance number of the NetWeaver ABAP ASCS instance.
Mandatory for NetWeaver ASCS/ERS cluster configuration.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_automatic_recover_bool +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_automatic_recover_bool - _Type:_ `bool` - _Default:_ `False` NetWeaver ASCS instance resource option "AUTOMATIC_RECOVER".
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_failure_timeout +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_failure_timeout - _Type:_ `string` - _Default:_ `60` NetWeaver ASCS instance failure-timeout attribute.
-Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1`). Default setup is ENSA2.
+Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1`). Default setup is ENSA2.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_migration_threshold +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_migration_threshold - _Type:_ `string` - _Default:_ `1` NetWeaver ASCS instance migration-threshold setting attribute.
-Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1`). Default setup is ENSA2.
+Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1`). Default setup is ENSA2.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name - _Type:_ `string` The name of the ASCS instance, typically the profile name.
Mandatory for the NetWeaver ASCS/ERS cluster setup
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name - _Type:_ `string` - _Default:_ `SAPInstance_NWAS_ABAP_ASCS__` Name of the ASCS instance resource.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_stickiness +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_stickiness - _Type:_ `string` - _Default:_ `5000` NetWeaver ASCS instance resource stickiness attribute.
-### sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string +### sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string - _Type:_ `string` The full path and name of the ASCS instance profile.
Mandatory for the NetWeaver ASCS/ERS cluster setup.
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_filesystem_resource_name +### sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name - _Type:_ `string` - _Default:_ `Filesystem_NWAS_ABAP_ERS__` Name of the filesystem resource for the ERS instance.
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number +### sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr - _Type:_ `string` Instance number of the NetWeaver ABAP ERS instance.
Mandatory for NetWeaver ASCS/ERS cluster configuration.
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool +### sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool - _Type:_ `bool` - _Default:_ `False` NetWeaver ERS instance resource option "AUTOMATIC_RECOVER".
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name +### sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name - _Type:_ `string` The name of the ERS instance, typically the profile name.
Mandatory for the NetWeaver ASCS/ERS cluster setup.
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name +### sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name - _Type:_ `string` - _Default:_ `SAPInstance_NWAS_ABAP_ERS__` Name of the ERS instance resource.
-### sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string +### sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string - _Type:_ `string` The full path and name of the ERS instance profile.
Mandatory for the NetWeaver ASCS/ERS cluster.
-### sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number +### sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr - _Type:_ `string` Instance number of the NetWeaver ABAP PAS instance.
Mandatory for NetWeaver PAS cluster configuration.
-### sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1 +### sap_ha_pacemaker_cluster_nwas_abap_sid -- _Type:_ `bool` -- _Default:_ `False` +- _Type:_ `string` -The standard NetWeaver ASCS/ERS cluster will be set up as ENSA2.
-Set this parameter to 'true' to configure it as ENSA1.
+SID of the NetWeaver instances.
+Mandatory for NetWeaver cluster configuration.
+Uses `sap_swpm_sid` if defined.
+Mandatory for NetWeaver cluster setups.
-### sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name +### sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name - _Type:_ `string` - _Default:_ `Filesystem_NWAS_SAPMNT_` Filesystem resource name for the shared filesystem /sapmnt.
Optional, this is typically managed by the OS, but can as well be added to the cluster configuration.
-Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`.
+Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`.
-### sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed +### sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed - _Type:_ `bool` - _Default:_ `False` Change this parameter to 'true' if the 3 shared filesystems `/usr/sap/trans`, `/usr/sap//SYS` and '/sapmnt' shall be configured as cloned cluster resources.
-### sap_ha_pacemaker_cluster_netweaver_sid - -- _Type:_ `string` - -SID of the NetWeaver instances.
-Mandatory for NetWeaver cluster configuration.
-Uses `sap_swpm_sid` if defined.
-Mandatory for NetWeaver cluster setups.
- -### sap_ha_pacemaker_cluster_netweaver_sys_filesystem_resource_name +### sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_name - _Type:_ `string` - _Default:_ `Filesystem_NWAS_SYS_` Filesystem resource name for the transports filesystem /usr/sap//SYS.
Optional, this is typically managed by the OS, but can as well be added to the cluster configuration.
-Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`.
+Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`.
-### sap_ha_pacemaker_cluster_netweaver_transports_filesystem_resource_name +### sap_ha_pacemaker_cluster_nwas_transports_filesystem_resource_name - _Type:_ `string` - _Default:_ `Filesystem_NWAS_TRANS_` Filesystem resource name for the transports filesystem /usr/sap/trans.
Optional, this is typically managed by the OS, but can as well be added to the cluster configuration.
-Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`.
+Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`.
### sap_ha_pacemaker_cluster_resource_defaults @@ -776,56 +769,56 @@ Customize the name of the resource managing the Virtual IP of the primary HANA i The virtual IP for read-only access to the secondary HANA instance.
Optional parameter in HANA clusters.
-### sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address +### sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address - _Type:_ `string` Virtual IP of the NetWeaver AAS instance.
Mandatory for NetWeaver AAS cluster setup.
-### sap_ha_pacemaker_cluster_vip_netweaver_aas_resource_name +### sap_ha_pacemaker_cluster_vip_nwas_abap_aas_resource_name - _Type:_ `string` - _Default:_ `vip___aas` Name of the SAPInstance resource for NetWeaver AAS.
-### sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address +### sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address - _Type:_ `string` Virtual IP of the NetWeaver ASCS instance.
Mandatory for NetWeaver ASCS/ERS cluster setup.
-### sap_ha_pacemaker_cluster_vip_netweaver_ascs_resource_name +### sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_name - _Type:_ `string` - _Default:_ `vip___ascs` Name of the SAPInstance resource for NetWeaver ASCS.
-### sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address +### sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address - _Type:_ `string` Virtual IP of the NetWeaver ERS instance.
Mandatory for NetWeaver ASCS/ERS cluster setup.
-### sap_ha_pacemaker_cluster_vip_netweaver_ers_resource_name +### sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_name - _Type:_ `string` - _Default:_ `vip___ers` Name of the SAPInstance resource for NetWeaver ERS.
-### sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address +### sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address - _Type:_ `string` Virtual IP of the NetWeaver PAS instance.
Mandatory for NetWeaver PAS cluster setup.
-### sap_ha_pacemaker_cluster_vip_netweaver_pas_resource_name +### sap_ha_pacemaker_cluster_vip_nwas_abap_pas_resource_name - _Type:_ `string` - _Default:_ `vip___pas` diff --git a/roles/sap_ha_pacemaker_cluster/defaults/main.yml b/roles/sap_ha_pacemaker_cluster/defaults/main.yml index 5d84e32c3..e5a04aa08 100644 --- a/roles/sap_ha_pacemaker_cluster/defaults/main.yml +++ b/roles/sap_ha_pacemaker_cluster/defaults/main.yml @@ -105,7 +105,7 @@ sap_ha_pacemaker_cluster_fence_agent_packages: [] # Mandatory. # Either inherit from the 'ha_cluster' LSR variable when defined, but do not set a default. # This fails the argument validation when none of the 2 vars are defined. -sap_ha_pacemaker_cluster_hacluster_password: "{{ ha_cluster_hacluster_password }}" +sap_ha_pacemaker_cluster_hacluster_user_password: "{{ ha_cluster_hacluster_password }}" ################################################################################ @@ -147,21 +147,21 @@ sap_ha_pacemaker_cluster_vip_hana_secondary_resource_name: "vip_{{ sap_ha_pacema # Default will be ENSA2. To configure HA resources for ENSA1, # set this parameter to 'true'. -sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1: false +sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1: false # Enable/Disable sap_cluster_connector. # Ref.: https://access.redhat.com/solutions/3606101 sap_ha_pacemaker_cluster_enable_cluster_connector: true # Inherit common synonym NetWeaver parameters when defined. -sap_ha_pacemaker_cluster_netweaver_sid: "{{ sap_swpm_sid | default('') }}" -sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number: "{{ sap_swpm_ascs_instance_nr | default('') }}" -sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number: "{{ sap_swpm_ers_instance_nr | default('') }}" -sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number: "{{ sap_swpm_pas_instance_nr | default('') }}" -sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number: "{{ sap_swpm_aas_instance_nr | default('') }}" +sap_ha_pacemaker_cluster_nwas_abap_sid: "{{ sap_swpm_sid | default('') }}" +sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr: "{{ sap_swpm_ascs_instance_nr | default('') }}" +sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr: "{{ sap_swpm_ers_instance_nr | default('') }}" +sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr: "{{ sap_swpm_pas_instance_nr | default('') }}" +sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr: "{{ sap_swpm_aas_instance_nr | default('') }}" # Prepare in case JAVA SCS/ERS will be included later. -#sap_ha_pacemaker_cluster_netweaver_java_scs_instance_number: "{{ sap_swpm_java_scs_instance_nr | default('') }}" -#sap_ha_pacemaker_cluster_netweaver_java_ers_instance_number: "{{ sap_swpm_java_ers_instance_nr | default('') }}" +#sap_ha_pacemaker_cluster_nwas_java_scs_instance_nr: "{{ sap_swpm_java_scs_instance_nr | default('') }}" +#sap_ha_pacemaker_cluster_nwas_java_ers_instance_nr: "{{ sap_swpm_java_ers_instance_nr | default('') }}" # Definitions for filesystems resources. Currently limited to NFS filesystems. sap_ha_pacemaker_cluster_storage_definition: "{{ sap_storage_setup_definition | default([]) }}" @@ -174,24 +174,17 @@ sap_ha_pacemaker_cluster_storage_nfs_server: "{{ sap_storage_nfs_server | defaul # TODO: review later and move to internal vars in vars/main.yml? sap_ha_pacemaker_cluster_resource_filesystem_force_unmount: safe -# The following directories are appended to the 'nfs_path' of the '/usr/sap' storage -# definition. -# Therefore, the /usr/sap prefix must be left out of the listed path items. -sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_filesystems: - - "{{ sap_ha_pacemaker_cluster_netweaver_sid }}/ASCS{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_sid }}/ERS{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}" - # Multiple VIP parameters can be defined and will be combined. # See tasks/include_construct_vip_resources.yml -sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address: '' -sap_ha_pacemaker_cluster_vip_netweaver_ascs_resource_name: "vip_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}_ascs" -sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address: '' -sap_ha_pacemaker_cluster_vip_netweaver_ers_resource_name: "vip_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}_ers" -sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address: '' -sap_ha_pacemaker_cluster_vip_netweaver_pas_resource_name: "vip_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number }}_pas" -sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address: '' -sap_ha_pacemaker_cluster_vip_netweaver_aas_resource_name: "vip_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number }}_aas" +sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: '' +sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_name: "vip_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}_ascs" +sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: '' +sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_name: "vip_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}_ers" +sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address: '' +sap_ha_pacemaker_cluster_vip_nwas_abap_pas_resource_name: "vip_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr }}_pas" +sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address: '' +sap_ha_pacemaker_cluster_vip_nwas_abap_aas_resource_name: "vip_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr }}_aas" # SAP NetWeaver common - Resource IDs (names) as convenience parameters @@ -199,14 +192,14 @@ sap_ha_pacemaker_cluster_vip_netweaver_aas_resource_name: "vip_{{ sap_ha_pacemak # - /sapmnt # - /usr/sap/trans # - /usr/sap/<>/SYS -sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name: "Filesystem_NWAS_SAPMNT_{{ sap_ha_pacemaker_cluster_netweaver_sid }}" -sap_ha_pacemaker_cluster_netweaver_transports_filesystem_resource_name: "Filesystem_NWAS_TRANS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}" -sap_ha_pacemaker_cluster_netweaver_sys_filesystem_resource_name: "Filesystem_NWAS_SYS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}" +sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name: "Filesystem_NWAS_SAPMNT_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}" +sap_ha_pacemaker_cluster_nwas_transports_filesystem_resource_name: "Filesystem_NWAS_TRANS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}" +sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_name: "Filesystem_NWAS_SYS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}" # The shared filesystems are not required to be configured in the cluster. # By default it is assumed that they are mounted by the system and available on all cluster nodes. # Set this parameter to "true" to configure the 3 shared filesystems as part of the cluster. -sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed: false +sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed: false ################################################################################ @@ -214,39 +207,39 @@ sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed: false ################################################################################ # Name of the instance profile - mandatory to be user-defined -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name: '' +sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name: '' # Full path with instance profile name - mandatory to be user-defined -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string: '' +sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string: '' # SAP NetWeaver ABAP ASCS/ERS - Resource IDs (names) as convenience parameters. # - /usr/sap/<>/ASCS<> # - /usr/sap/<>/ERS<> -sap_ha_pacemaker_cluster_netweaver_abap_ascs_filesystem_resource_name: "Filesystem_NWAS_ABAP_ASCS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}" -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_ASCS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name }}-clone" -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_automatic_recover_bool: false -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_stickiness: 5000 -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_migration_threshold: 1 -sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_failure_timeout: 60 +sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name: "Filesystem_NWAS_ABAP_ASCS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}" +sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_ASCS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ 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_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 +sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_failure_timeout: 60 # Stickiness of the ASCS group -sap_ha_pacemaker_cluster_netweaver_abap_ascs_group_stickiness: 3000 +sap_ha_pacemaker_cluster_nwas_abap_ascs_group_stickiness: 3000 ################################################################################ # ERS resource defaults ################################################################################ # Name of the instance profile - mandatory to be user-defined -sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name: '' +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_netweaver_abap_ers_sapinstance_start_profile_string: '' +sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string: '' -sap_ha_pacemaker_cluster_netweaver_abap_ers_filesystem_resource_name: "Filesystem_NWAS_ABAP_ERS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}" -sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_ERS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name }}-clone" -sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool: false +sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name: "Filesystem_NWAS_ABAP_ERS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}" +sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_ERS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name }}-clone" +sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool: false ################################################################################ @@ -254,10 +247,10 @@ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool: ################################################################################ # SAP NetWeaver ABAP PAS/AAS - Resource IDs (names) as convenience parameters. # - /usr/sap/<>/D<> -#sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_resource_name: "Filesystem_NWAS_ABAP_PAS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_PAS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_resource_name: "Filesystem_NWAS_ABAP_AAS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_AAS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number }}" +#sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_resource_name: "Filesystem_NWAS_ABAP_PAS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_PAS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_resource_name: "Filesystem_NWAS_ABAP_AAS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_resource_name: "SAPInstance_NWAS_ABAP_AAS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr }}" ################################################################################ # JAVA SCS/ERS resource defaults @@ -265,12 +258,12 @@ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool: # SAP NetWeaver JAVA SCS/ERS - Resource IDs (names) as convenience parameters. # - /usr/sap/<>/SCS<> # - /usr/sap/<>/ERS<> -#sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_resource_name: "Filesytem_NWAS_JAVA_SCS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_java_scs_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_name: "SAPInstance_NWAS_JAVA_SCS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_java_scs_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name }}-clone" -#sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_resource_name: "Filesytem_NWAS_JAVA_ERS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_java_ers_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_name: "SAPInstance_NWAS_JAVA_ERS_{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ sap_ha_pacemaker_cluster_netweaver_java_ers_instance_number }}" -#sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name }}-clone" +#sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_resource_name: "Filesytem_NWAS_JAVA_SCS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_java_scs_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_name: "SAPInstance_NWAS_JAVA_SCS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_java_scs_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name }}-clone" +#sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_resource_name: "Filesytem_NWAS_JAVA_ERS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_java_ers_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_name: "SAPInstance_NWAS_JAVA_ERS_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ sap_ha_pacemaker_cluster_nwas_java_ers_instance_nr }}" +#sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_clone_name: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name }}-clone" ################################################################################ diff --git a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml index 4449754e4..cbc437a9d 100644 --- a/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml +++ b/roles/sap_ha_pacemaker_cluster/meta/argument_specs.yml @@ -246,7 +246,7 @@ argument_specs: - Additional fence agent packages to be installed. - This is automatically combined with `sap_ha_pacemaker_cluster_fence_agent_minimal_packages`. - sap_ha_pacemaker_cluster_hacluster_password: + sap_ha_pacemaker_cluster_hacluster_user_password: description: - The password of the `hacluster` user which is created during pacemaker installation. - Inherits the value of `ha_cluster_hacluster_password`, when defined. @@ -343,7 +343,7 @@ argument_specs: # NetWeaver specific parameters ########################################################################## - sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1: + sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1: type: bool default: false description: @@ -357,29 +357,29 @@ argument_specs: - Enables/Disables the SAP HA Interface for SAP ABAP application server instances, also known as `sap_cluster_connector`. - Set this parameter to 'false' if the SAP HA interface should not be installed and configured. - sap_ha_pacemaker_cluster_netweaver_sid: + sap_ha_pacemaker_cluster_nwas_abap_sid: description: - SID of the NetWeaver instances. - Mandatory for NetWeaver cluster configuration. - Uses `sap_swpm_sid` if defined. - Mandatory for NetWeaver cluster setups. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number: + sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr: description: - Instance number of the NetWeaver ABAP ASCS instance. - Mandatory for NetWeaver ASCS/ERS cluster configuration. - sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number: + sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr: description: - Instance number of the NetWeaver ABAP ERS instance. - Mandatory for NetWeaver ASCS/ERS cluster configuration. - sap_ha_pacemaker_cluster_netweaver_abap_pas_instance_number: + sap_ha_pacemaker_cluster_nwas_abap_pas_instance_nr: description: - Instance number of the NetWeaver ABAP PAS instance. - Mandatory for NetWeaver PAS cluster configuration. - sap_ha_pacemaker_cluster_netweaver_abap_aas_instance_number: + sap_ha_pacemaker_cluster_nwas_abap_aas_instance_nr: description: - Instance number of the NetWeaver ABAP AAS instance. - Mandatory for NetWeaver AAS cluster configuration. @@ -428,76 +428,68 @@ argument_specs: description: - Default address of the NFS server, if not defined individually by filesystem. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_filesystems: - type: list - default: - - /ASCS - - /ERS - description: - - Standard NetWeaver paths in "/usr/sap" and automatically appended to the configuration, when "/usr/sap" is in the list of `sap_ha_pacemaker_cluster_storage_definition`. - - sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address: + sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address: description: - Virtual IP of the NetWeaver ASCS instance. - Mandatory for NetWeaver ASCS/ERS cluster setup. - sap_ha_pacemaker_cluster_vip_netweaver_ascs_resource_name: + sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_name: default: vip___ascs description: - Name of the SAPInstance resource for NetWeaver ASCS. - sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address: + sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address: description: - Virtual IP of the NetWeaver ERS instance. - Mandatory for NetWeaver ASCS/ERS cluster setup. - sap_ha_pacemaker_cluster_vip_netweaver_ers_resource_name: + sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_name: default: vip___ers description: - Name of the SAPInstance resource for NetWeaver ERS. - sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address: + sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address: description: - Virtual IP of the NetWeaver PAS instance. - Mandatory for NetWeaver PAS cluster setup. - sap_ha_pacemaker_cluster_vip_netweaver_pas_resource_name: + sap_ha_pacemaker_cluster_vip_nwas_abap_pas_resource_name: default: vip___pas description: - Name of the SAPInstance resource for NetWeaver PAS. - sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address: + sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address: description: - Virtual IP of the NetWeaver AAS instance. - Mandatory for NetWeaver AAS cluster setup. - sap_ha_pacemaker_cluster_vip_netweaver_aas_resource_name: + sap_ha_pacemaker_cluster_vip_nwas_abap_aas_resource_name: default: vip___aas description: - Name of the SAPInstance resource for NetWeaver AAS. - sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name: + sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name: default: Filesystem_NWAS_SAPMNT_ description: - Filesystem resource name for the shared filesystem /sapmnt. - Optional, this is typically managed by the OS, but can as well be added to the cluster configuration. - - Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`. + - Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`. - sap_ha_pacemaker_cluster_netweaver_transports_filesystem_resource_name: + sap_ha_pacemaker_cluster_nwas_transports_filesystem_resource_name: default: Filesystem_NWAS_TRANS_ description: - Filesystem resource name for the transports filesystem /usr/sap/trans. - Optional, this is typically managed by the OS, but can as well be added to the cluster configuration. - - Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`. + - Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`. - sap_ha_pacemaker_cluster_netweaver_sys_filesystem_resource_name: + sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_name: default: Filesystem_NWAS_SYS_ description: - Filesystem resource name for the transports filesystem /usr/sap//SYS. - Optional, this is typically managed by the OS, but can as well be added to the cluster configuration. - - Enable this resource setup using `sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed`. + - Enable this resource setup using `sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed`. - sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed: + sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed: type: bool default: false description: @@ -508,50 +500,50 @@ argument_specs: # NetWeaver ASCS specific parameters ########################################################################## - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name: description: - The name of the ASCS instance, typically the profile name. - Mandatory for the NetWeaver ASCS/ERS cluster setup - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string: description: - The full path and name of the ASCS instance profile. - Mandatory for the NetWeaver ASCS/ERS cluster setup. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_filesystem_resource_name: + sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name: default: Filesystem_NWAS_ABAP_ASCS__ description: - Name of the filesystem resource for the ASCS instance. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name: default: SAPInstance_NWAS_ABAP_ASCS__ description: - Name of the ASCS instance resource. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_automatic_recover_bool: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_automatic_recover_bool: type: bool default: false description: - NetWeaver ASCS instance resource option "AUTOMATIC_RECOVER". - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_stickiness: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_stickiness: default: 5000 description: - NetWeaver ASCS instance resource stickiness attribute. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_migration_threshold: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_migration_threshold: default: 1 description: - NetWeaver ASCS instance migration-threshold setting attribute. - - Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1`). Default setup is ENSA2. + - Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1`). Default setup is ENSA2. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_failure_timeout: + sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_failure_timeout: default: 60 description: - NetWeaver ASCS instance failure-timeout attribute. - - Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1`). Default setup is ENSA2. + - Only used for ENSA1 setups (see `sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1`). Default setup is ENSA2. - sap_ha_pacemaker_cluster_netweaver_abap_ascs_group_stickiness: + sap_ha_pacemaker_cluster_nwas_abap_ascs_group_stickiness: default: 3000 description: - NetWeaver ASCS resource group stickiness to prefer the ASCS group to stay on the node it was started on. @@ -561,28 +553,28 @@ argument_specs: # NetWeaver ERS specific parameters ########################################################################## - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name: + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name: description: - The name of the ERS instance, typically the profile name. - Mandatory for the NetWeaver ASCS/ERS cluster setup. - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string: + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string: description: - The full path and name of the ERS instance profile. - Mandatory for the NetWeaver ASCS/ERS cluster. - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool: + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool: type: bool default: false description: - NetWeaver ERS instance resource option "AUTOMATIC_RECOVER". - sap_ha_pacemaker_cluster_netweaver_abap_ers_filesystem_resource_name: + sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name: default: Filesystem_NWAS_ABAP_ERS__ description: - Name of the filesystem resource for the ERS instance. - sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name: + sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name: default: SAPInstance_NWAS_ABAP_ERS__ description: - Name of the ERS instance resource. diff --git a/roles/sap_ha_pacemaker_cluster/tasks/ascertain_sap_landscape.yml b/roles/sap_ha_pacemaker_cluster/tasks/ascertain_sap_landscape.yml index a01cf87e0..b6bdaaa58 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/ascertain_sap_landscape.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/ascertain_sap_landscape.yml @@ -39,6 +39,6 @@ - name: "SAP HA Prepare Pacemaker - Include NETWEAVER specific variables" ansible.builtin.include_tasks: - file: include_vars_netweaver.yml + file: include_vars_nwas.yml when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas') | length > 0 diff --git a/roles/sap_ha_pacemaker_cluster/tasks/configure_netweaver_ascs_ers_postinstallation.yml b/roles/sap_ha_pacemaker_cluster/tasks/configure_nwas_ascs_ers_postinstallation.yml similarity index 70% rename from roles/sap_ha_pacemaker_cluster/tasks/configure_netweaver_ascs_ers_postinstallation.yml rename to roles/sap_ha_pacemaker_cluster/tasks/configure_nwas_ascs_ers_postinstallation.yml index 0660a3aab..0bc12838e 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/configure_netweaver_ascs_ers_postinstallation.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/configure_nwas_ascs_ers_postinstallation.yml @@ -5,14 +5,14 @@ - name: "SAP HA Pacemaker - (ASCS profile) Prevent automatic restart of enqueue server" ansible.builtin.replace: - path: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string }}" + path: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string }}" backup: true regexp: 'Restart_Program_01' replace: 'Start_Program_01' - name: "SAP HA Pacemaker - (ERS profile) Prevent automatic restart" ansible.builtin.replace: - path: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string }}" + path: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string }}" backup: true regexp: 'Restart_Program_00' replace: 'Start_Program_00' @@ -27,20 +27,20 @@ regexp: '^([^#\n].+{{ sapserv_item }}.+)$' replace: '# \1' loop: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name }}" loop_control: loop_var: sapserv_item - name: "SAP HA Pacemaker - (systemd) Check for ASCS/ERS services" ansible.builtin.stat: - path: "/etc/systemd/system/SAP{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ systemd_item }}.service" + path: "/etc/systemd/system/SAP{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ systemd_item }}.service" loop: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}" loop_control: loop_var: systemd_item - label: "SAP{{ sap_ha_pacemaker_cluster_netweaver_sid }}_{{ systemd_item }}.service" + label: "SAP{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_{{ systemd_item }}.service" register: __sap_ha_pacemaker_cluster_register_instance_service - name: "SAP HA Pacemaker - (systemd) Save found ASCS/ERS services" @@ -103,91 +103,91 @@ # # The 'sap-cluster-connector' package is already optionally added to # '__sap_ha_pacemaker_cluster_sap_extra_packages'. -- name: "SAP HA Pacemaker - (SAP HAlib) Configure SAP HA Interface" +- name: "SAP HA Pacemaker - (SAP HA Interface) Configure SAP HA Interface" when: - sap_ha_pacemaker_cluster_enable_cluster_connector block: - - name: "SAP HA Pacemaker - (SAP HAlib) Add {{sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm user to 'haclient' group" + - name: "SAP HA Pacemaker - (SAP HA Interface) Add {{sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm user to 'haclient' group" ansible.builtin.user: - name: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + name: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" groups: haclient append: true state: present # Using 'lineinfile' with a nested loop to avoid duplicate entries for existing configuration. - - name: "SAP HA Pacemaker - (SAP HAlib) Add connector to start profiles" + - name: "SAP HA Pacemaker - (SAP HA Interface) Add connector to start profiles" ansible.builtin.lineinfile: backup: true path: "{{ nwas_profile_item.0 }}" line: "{{ nwas_profile_item.1 }}" - loop: "{{ __sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_profile_paths + loop: "{{ __sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_profile_paths | product(__sap_ha_pacemaker_cluster_connector_config_lines) }}" loop_control: loop_var: nwas_profile_item label: "{{ nwas_profile_item.0 }} -> {{ nwas_profile_item.1 }}" - - name: "SAP HA Pacemaker - (SAP HAlib) Check where ASCS is running" - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + - name: "SAP HA Pacemaker - (SAP HA Interface) Check where ASCS is running" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_where_ascs ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }} -function GetProcessList + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }} -function GetProcessList changed_when: false failed_when: false - - name: "SAP HA Pacemaker - (SAP HAlib) Check where ERS is running" - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + - name: "SAP HA Pacemaker - (SAP HA Interface) Check where ERS is running" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_where_ers ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }} -function GetProcessList + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }} -function GetProcessList changed_when: false failed_when: false - - name: "SAP HA Pacemaker - (SAP HAlib) Restart the ASCS service" + - name: "SAP HA Pacemaker - (SAP HA Interface) Restart the ASCS service" when: - __sap_ha_pacemaker_cluster_register_where_ascs.rc == 3 - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_restart_ascs ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }} -function RestartService + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }} -function RestartService changed_when: __sap_ha_pacemaker_cluster_register_restart_ascs.rc == 0 - - name: "SAP HA Pacemaker - (SAP HAlib) Restart the ERS service" + - name: "SAP HA Pacemaker - (SAP HA Interface) Restart the ERS service" when: - __sap_ha_pacemaker_cluster_register_where_ers.rc == 3 - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_restart_ers ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }} -function RestartService + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }} -function RestartService changed_when: __sap_ha_pacemaker_cluster_register_restart_ers.rc == 0 - - name: "SAP HA Pacemaker - (SAP HAlib) Run HA check for ASCS" + - name: "SAP HA Pacemaker - (SAP HA Interface) Run HA check for ASCS" when: - __sap_ha_pacemaker_cluster_register_where_ascs.rc == 3 - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_ascs_ha ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }} -function HACheckConfig + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }} -function HACheckConfig changed_when: false - - name: "SAP HA Pacemaker - (SAP HAlib) Run HA check for ERS" + - name: "SAP HA Pacemaker - (SAP HA Interface) Run HA check for ERS" when: - __sap_ha_pacemaker_cluster_register_where_ers.rc == 3 - become_user: "{{ sap_ha_pacemaker_cluster_netweaver_sid | lower }}adm" + become_user: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid | lower }}adm" register: __sap_ha_pacemaker_cluster_register_ers_ha ansible.builtin.shell: | - /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }} -function HACheckConfig + /usr/sap/hostctrl/exe/sapcontrol -nr {{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }} -function HACheckConfig changed_when: false - - name: "SAP HA Pacemaker - (SAP HAlib) Display HA check results for ASCS" + - name: "SAP HA Pacemaker - (SAP HA Interface) Display HA check results for ASCS" when: - __sap_ha_pacemaker_cluster_register_where_ascs.rc == 3 ansible.builtin.debug: msg: | {{ __sap_ha_pacemaker_cluster_register_ascs_ha.stdout }} - - name: "SAP HA Pacemaker - (SAP HAlib) Display HA check results for ERS" + - name: "SAP HA Pacemaker - (SAP HA Interface) Display HA check results for ERS" when: - __sap_ha_pacemaker_cluster_register_where_ers.rc == 3 ansible.builtin.debug: @@ -195,6 +195,6 @@ {{ __sap_ha_pacemaker_cluster_register_ers_ha.stdout }} - # TODO: verification checks that the instances are running and HAlib is enabled + # TODO: verification checks that the instances are running and HA Interface is enabled ### END of BLOCK for sap_cluster_connector. diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_final_hacluster_vars.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_final_hacluster_vars.yml index db3eded7f..a919561a4 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_final_hacluster_vars.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_final_hacluster_vars.yml @@ -21,7 +21,7 @@ # __sap_ha_pacemaker_cluster_constraints_order ha_cluster_constraints_order # __sap_ha_pacemaker_cluster_extra_packages ha_cluster_extra_packages # __sap_ha_pacemaker_cluster_fence_agent_packages ha_cluster_fence_agent_packages -# __sap_ha_pacemaker_cluster_hacluster_password ha_cluster_hacluster_password +# __sap_ha_pacemaker_cluster_hacluster_user_password ha_cluster_hacluster_password # __sap_ha_pacemaker_cluster_repos __ha_cluster_repos # __sap_ha_pacemaker_cluster_resource_clones ha_cluster_resource_clones # __sap_ha_pacemaker_cluster_resource_groups ha_cluster_resource_groups @@ -68,9 +68,9 @@ ha_cluster_fence_agent_packages: "{{ __sap_ha_pacemaker_cluster_fence_agent_packages }}" - name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_hacluster_password'" - when: __sap_ha_pacemaker_cluster_hacluster_password is defined + when: __sap_ha_pacemaker_cluster_hacluster_user_password is defined ansible.builtin.set_fact: - ha_cluster_hacluster_password: "{{ __sap_ha_pacemaker_cluster_hacluster_password }}" + ha_cluster_hacluster_password: "{{ __sap_ha_pacemaker_cluster_hacluster_user_password }}" no_log: true # secure the credential - name: "SAP HA Prepare Pacemaker - (ha_cluster) Define parameter 'ha_cluster_repos'" diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml index f25a1504f..bc6e17140 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_common.yml @@ -12,13 +12,13 @@ ansible.builtin.set_fact: __sap_ha_pacemaker_cluster_cluster_name: "{{ sap_ha_pacemaker_cluster_cluster_name }}" -# sap_ha_pacemaker_cluster_hacluster_password -> user-defined or default inherited from {{ ha_cluster_hacluster_password }} +# sap_ha_pacemaker_cluster_hacluster_user_password -> user-defined or default inherited from {{ ha_cluster_hacluster_password }} - name: "SAP HA Prepare Pacemaker - Register the 'hacluster' user password" when: - - __sap_ha_pacemaker_cluster_hacluster_password is not defined - - sap_ha_pacemaker_cluster_hacluster_password + - __sap_ha_pacemaker_cluster_hacluster_user_password is not defined + - sap_ha_pacemaker_cluster_hacluster_user_password ansible.builtin.set_fact: - __sap_ha_pacemaker_cluster_hacluster_password: "{{ sap_ha_pacemaker_cluster_hacluster_password }}" + __sap_ha_pacemaker_cluster_hacluster_user_password: "{{ sap_ha_pacemaker_cluster_hacluster_user_password }}" no_log: true # secure the credential diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_ascs_ers.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_ascs_ers.yml similarity index 73% rename from roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_ascs_ers.yml rename to roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_ascs_ers.yml index 2f3b687fc..5d6b32cc9 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_ascs_ers.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_ascs_ers.yml @@ -23,39 +23,39 @@ ### Different SAPInstance resource attributes for ENSA1 and ENSA2 - name: "SAP HA Prepare Pacemaker - Define default ASCS/ERS instance attributes (ENSA2)" - when: not sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1 + when: not sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1 ansible.builtin.set_fact: - __sap_ha_pacemaker_cluster_netweaver_ascs_sapinstance_meta_attrs: + __sap_ha_pacemaker_cluster_nwas_ascs_sapinstance_meta_attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_stickiness }}" - __sap_ha_pacemaker_cluster_netweaver_ers_sapinstance_instance_attrs: + __sap_ha_pacemaker_cluster_nwas_ers_sapinstance_instance_attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool | string }}" - name: "SAP HA Prepare Pacemaker - Define ASCS/ERS instance attributes (ENSA1)" - when: sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1 + when: sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1 ansible.builtin.set_fact: - __sap_ha_pacemaker_cluster_netweaver_ascs_sapinstance_meta_attrs: + __sap_ha_pacemaker_cluster_nwas_ascs_sapinstance_meta_attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_stickiness }}" - name: migration-threshold - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_migration_threshold }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_migration_threshold }}" - name: failure-timeout - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_ensa1_failure_timeout }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_ensa1_failure_timeout }}" - __sap_ha_pacemaker_cluster_netweaver_ers_sapinstance_instance_attrs: + __sap_ha_pacemaker_cluster_nwas_ers_sapinstance_instance_attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_automatic_recover_bool | string }}" - name: IS_ERS value: true @@ -68,9 +68,9 @@ __resource_filesystem: id: |- {%- if '/ASCS' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_abap_ascs_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name %} {%- elif '/ERS' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_abap_ers_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name %} {%- endif -%} {{ idname }} agent: "ocf:heartbeat:Filesystem" @@ -151,7 +151,7 @@ {%- endfor %} __mountpoint: "{{ fsres_item }}" - loop: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_filesystems }}" + loop: "{{ __sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_filesystems }}" loop_control: loop_var: fsres_item label: "{{ fsres_item }}" @@ -167,18 +167,18 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance] }}" vars: __resource_sapinstance: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_automatic_recover_bool | string }}" meta_attrs: - - attrs: "{{ __sap_ha_pacemaker_cluster_netweaver_ascs_sapinstance_meta_attrs }}" + - attrs: "{{ __sap_ha_pacemaker_cluster_nwas_ascs_sapinstance_meta_attrs }}" operations: - action: start attrs: @@ -210,10 +210,10 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance_ers] }}" vars: __resource_sapinstance_ers: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - - attrs: "{{ __sap_ha_pacemaker_cluster_netweaver_ers_sapinstance_instance_attrs }}" + - attrs: "{{ __sap_ha_pacemaker_cluster_nwas_ers_sapinstance_instance_attrs }}" operations: - action: start attrs: @@ -255,15 +255,15 @@ __sap_ha_pacemaker_cluster_resource_groups: "{{ __sap_ha_pacemaker_cluster_resource_groups + [__ascs_group] }}" vars: __ascs_group: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ASCS{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}_group" resource_ids: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_filesystem_resource_name }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name }}" - - "{{ sap_ha_pacemaker_cluster_vip_netweaver_ascs_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_filesystem_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_name }}" meta_attrs: - attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_group_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_group_stickiness }}" when: - __ascs_group.id is not in (__sap_ha_pacemaker_cluster_resource_groups | map(attribute='id')) @@ -279,11 +279,11 @@ __sap_ha_pacemaker_cluster_resource_groups: "{{ __sap_ha_pacemaker_cluster_resource_groups + [__ers_group] }}" vars: __ers_group: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ERS{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}_group" resource_ids: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_filesystem_resource_name }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_resource_name }}" - - "{{ sap_ha_pacemaker_cluster_vip_netweaver_ers_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_filesystem_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_resource_name }}" + - "{{ sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_name }}" when: - __ers_group.id is not in (__sap_ha_pacemaker_cluster_resource_groups | map(attribute='id')) @@ -307,10 +307,10 @@ vars: __constraint_colo_ers: resource_leader: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ASCS{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}_group" role: started resource_follower: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ERS{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}_group" options: - name: score value: -5000 @@ -324,10 +324,10 @@ vars: __constraint_order_ascs_ers: resource_first: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ASCS{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}_group" role: started resource_then: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ERS{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}_group" options: - name: symmetrical value: "false" @@ -343,13 +343,13 @@ vars: __constraint_location_ascs_ers: resource: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_resource_name }}" - rule: "runs_ers_{{ sap_ha_pacemaker_cluster_netweaver_sid }} eq 1" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_resource_name }}" + rule: "runs_ers_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }} eq 1" options: - name: score value: 2000 when: - - sap_ha_pacemaker_cluster_netweaver_ascs_ers_ensa1 + - sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_ensa1 # When /sapmnt is managed by the cluster, @@ -360,12 +360,12 @@ vars: __constraint_order_sapmnt: resource_first: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name }}-clone" + id: "{{ sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name }}-clone" role: started resource_then: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ASCS{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}_group" when: - - sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed + - sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed - name: "SAP HA Prepare Pacemaker - Add order constraint: first start /sapmnt, then start ERS group" ansible.builtin.set_fact: @@ -373,9 +373,9 @@ vars: __constraint_order_sapmnt: resource_first: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name }}-clone" + id: "{{ sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name }}-clone" role: started resource_then: - id: "{{ sap_ha_pacemaker_cluster_netweaver_sid }}_ERS{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}_group" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}_ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}_group" when: - - sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed + - sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_pas_aas.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_pas_aas.yml similarity index 66% rename from roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_pas_aas.yml rename to roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_pas_aas.yml index 54b2d7834..17be8c306 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_abap_pas_aas.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_abap_pas_aas.yml @@ -15,20 +15,20 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_filesystem] }}" vars: __resource_filesystem: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_resource_name }}" agent: "ocf:heartbeat:Filesystem" instance_attrs: - attrs: - name: device - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_host_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_host_mount_path }}" - name: directory - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_local_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_local_mount_path }}" - name: fstype - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_fstype }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_fstype }}" - name: options - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_options_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_options_string }}" - name: force_unmount - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_filesystem_force_unmount }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_filesystem_force_unmount }}" operations: - action: start attrs: @@ -56,20 +56,20 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_filesystem] }}" vars: __resource_filesystem: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_resource_name }}" agent: "ocf:heartbeat:Filesystem" instance_attrs: - attrs: - name: device - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_host_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_host_mount_path }}" - name: directory - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_local_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_local_mount_path }}" - name: fstype - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_fstype }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_fstype }}" - name: options - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_options_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_options_string }}" - name: force_unmount - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_filesystem_force_unmount }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_filesystem_force_unmount }}" operations: - action: start attrs: @@ -97,24 +97,24 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance] }}" vars: __resource_sapinstance: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_automatic_recover_bool | string }}" meta_attrs: - attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_resource_stickiness }}" - name: migration-threshold - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_migration_threshold }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_migration_threshold }}" - name: failure-timeout - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_pas_sapinstance_failure_timeout }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_pas_sapinstance_failure_timeout }}" operations: - action: start attrs: @@ -144,24 +144,24 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance_ers] }}" vars: __resource_sapinstance_ers: - id: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_automatic_recover_bool | string }}" meta_attrs: - attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_resource_stickiness }}" - name: migration-threshold - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_migration_threshold }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_migration_threshold }}" - name: failure-timeout - value: "{{ sap_ha_pacemaker_cluster_netweaver_abap_aas_sapinstance_failure_timeout }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_abap_aas_sapinstance_failure_timeout }}" operations: - action: start attrs: diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_common.yml similarity index 83% rename from roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_common.yml rename to roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_common.yml index 06a4b806a..ccaae9c04 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_common.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_common.yml @@ -24,11 +24,11 @@ __resource_filesystem: id: |- {%- if '/sapmnt' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name %} {% elif '/usr/sap/trans' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_transports_filesystem_resource_name %} - {% elif '/usr/sap/' + sap_ha_pacemaker_cluster_netweaver_sid + '/SYS' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_sys_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_transports_filesystem_resource_name %} + {% elif '/usr/sap/' + sap_ha_pacemaker_cluster_nwas_abap_sid + '/SYS' in __mountpoint -%} + {% set idname = sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_name %} {% endif %} {{ idname }} @@ -71,13 +71,13 @@ __nfs_server: "{{ commonfs_item.nfs_server | default(sap_ha_pacemaker_cluster_storage_nfs_server) | regex_replace('/$', '') }}" __nfs_path: |- {%- if '/usr/sap' in commonfs_item.nfs_path and '/usr/sap/trans' not in commonfs_item.nfs_path -%} - {{ commonfs_item.nfs_path | regex_replace('^/', '') | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_netweaver_sid }}/SYS + {{ commonfs_item.nfs_path | regex_replace('^/', '') | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}/SYS {%- else -%} {{ commonfs_item.nfs_path | regex_replace('^/', '') | regex_replace('/$', '') }} {%- endif %} __mountpoint: |- {%- if commonfs_item.mountpoint | regex_replace('/$', '') == '/usr/sap' -%} - {{ commonfs_item.mountpoint | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_netweaver_sid }}/SYS + {{ commonfs_item.mountpoint | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}/SYS {%- else -%} {{ commonfs_item.mountpoint | regex_replace('/$', '') }} {%- endif %} @@ -87,7 +87,7 @@ loop_var: commonfs_item label: "{{ commonfs_item.name }}" when: - - sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed + - sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed - commonfs_item.mountpoint is defined - commonfs_item.nfs_path is defined - "'/usr/sap' in commonfs_item.mountpoint @@ -105,11 +105,11 @@ __clone_common_filesystem: resource_id: |- {%- if '/sapmnt' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_sapmnt_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_sapmnt_filesystem_resource_name %} {% elif '/usr/sap/trans' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_transports_filesystem_resource_name %} - {% elif '/usr/sap/' + sap_ha_pacemaker_cluster_netweaver_sid + '/SYS' in __mountpoint -%} - {% set idname = sap_ha_pacemaker_cluster_netweaver_sys_filesystem_resource_name %} + {% set idname = sap_ha_pacemaker_cluster_nwas_transports_filesystem_resource_name %} + {% elif '/usr/sap/' + sap_ha_pacemaker_cluster_nwas_abap_sid + '/SYS' in __mountpoint -%} + {% set idname = sap_ha_pacemaker_cluster_nwas_sys_filesystem_resource_name %} {% endif %} {{ idname }} meta_attrs: @@ -119,7 +119,7 @@ __mountpoint: |- {%- if commonfsclone_item.mountpoint | regex_replace('/$', '') == '/usr/sap' -%} - {{ commonfsclone_item.mountpoint | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_netweaver_sid }}/SYS + {{ commonfsclone_item.mountpoint | regex_replace('/$', '') }}/{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}/SYS {%- else -%} {{ commonfsclone_item.mountpoint | regex_replace('/$', '') }} {%- endif %} @@ -129,7 +129,7 @@ loop_var: commonfsclone_item label: "{{ commonfsclone_item.name }}" when: - - sap_ha_pacemaker_cluster_netweaver_shared_filesystems_cluster_managed + - sap_ha_pacemaker_cluster_nwas_shared_filesystems_cluster_managed - commonfsclone_item.mountpoint is defined - commonfsclone_item.nfs_path is defined - "'/usr/sap' in commonfsclone_item.mountpoint diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_java_scs_ers.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_java_scs_ers.yml similarity index 72% rename from roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_java_scs_ers.yml rename to roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_java_scs_ers.yml index 67e66aabb..42867c02c 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_netweaver_java_scs_ers.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_nwas_java_scs_ers.yml @@ -15,20 +15,20 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_filesystem] }}" vars: __resource_filesystem: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_resource_name }}" agent: "ocf:heartbeat:Filesystem" instance_attrs: - attrs: - name: device - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_host_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_host_mount_path }}" - name: directory - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_local_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_local_mount_path }}" - name: fstype - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_fstype }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_fstype }}" - name: options - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_options_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_options_string }}" - name: force_unmount - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_force_unmount }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_force_unmount }}" operations: - action: start attrs: @@ -56,20 +56,20 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_filesystem] }}" vars: __resource_filesystem: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_resource_name }}" agent: "ocf:heartbeat:Filesystem" instance_attrs: - attrs: - name: device - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_host_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_host_mount_path }}" - name: directory - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_local_mount_path }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_local_mount_path }}" - name: fstype - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_fstype }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_fstype }}" - name: options - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_options_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_options_string }}" - name: force_unmount - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_force_unmount }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_force_unmount }}" operations: - action: start attrs: @@ -98,24 +98,24 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance] }}" vars: __resource_sapinstance: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_automatic_recover_bool | string }}" meta_attrs: - attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_stickiness }}" - name: migration-threshold - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_migration_threshold }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_migration_threshold }}" - name: failure-timeout - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_failure_timeout }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_failure_timeout }}" operations: - action: start attrs: @@ -145,24 +145,24 @@ __sap_ha_pacemaker_cluster_resource_primitives: "{{ __sap_ha_pacemaker_cluster_resource_primitives + [__resource_sapinstance_ers] }}" vars: __resource_sapinstance_ers: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_name }}" agent: "ocf:heartbeat:SAPInstance" instance_attrs: - attrs: - name: InstanceName - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_instance_name }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_instance_name }}" - name: START_PROFILE - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_start_profile_string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_start_profile_string }}" - name: AUTOMATIC_RECOVER - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_automatic_recover_bool | string }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_automatic_recover_bool | string }}" meta_attrs: - attrs: - name: resource-stickiness - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_stickiness }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_stickiness }}" - name: migration-threshold - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_migration_threshold }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_migration_threshold }}" - name: failure-timeout - value: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_failure_timeout }}" + value: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_failure_timeout }}" operations: - action: start attrs: @@ -193,7 +193,7 @@ __sap_ha_pacemaker_cluster_resource_clones: "{{ __sap_ha_pacemaker_cluster_resource_clones + [__clone_filesystem] }}" vars: __clone_filesystem: - resource_id: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_filesystem_resource_name }}" + resource_id: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_filesystem_resource_name }}" promotable: "no" meta_attrs: - attrs: @@ -211,7 +211,7 @@ __sap_ha_pacemaker_cluster_resource_clones: "{{ __sap_ha_pacemaker_cluster_resource_clones + [__clone_filesystem] }}" vars: __clone_filesystem: - resource_id: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_filesystem_resource_name }}" + resource_id: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_filesystem_resource_name }}" promotable: "no" meta_attrs: - attrs: @@ -230,7 +230,7 @@ __sap_ha_pacemaker_cluster_resource_clones: "{{ __sap_ha_pacemaker_cluster_resource_clones + [__clone_sapinstance] }}" vars: __clone_sapinstance: - resource_id: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_name }}" + resource_id: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_name }}" promotable: "yes" meta_attrs: - attrs: @@ -248,7 +248,7 @@ __sap_ha_pacemaker_cluster_resource_clones: "{{ __sap_ha_pacemaker_cluster_resource_clones + [__clone_sapinstance_ers] }}" vars: __clone_sapinstance_ers: - resource_id: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_name }}" + resource_id: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_name }}" promotable: "yes" meta_attrs: - attrs: @@ -268,10 +268,10 @@ vars: __constraint_order_sapinstance: resource_first: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_scs_sapinstance_resource_clone_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_scs_sapinstance_resource_clone_name }}" action: start resource_then: - id: "{{ sap_ha_pacemaker_cluster_netweaver_java_ers_sapinstance_resource_clone_name }}" + id: "{{ sap_ha_pacemaker_cluster_nwas_java_ers_sapinstance_resource_clone_name }}" action: start options: - name: symmetrical diff --git a/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml b/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml index 6598e8ff3..a2ca8de87 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/import_hacluster_vars_from_inventory.yml @@ -65,7 +65,7 @@ - name: "SAP HA Prepare Pacemaker - (ha_cluster) Register parameter 'ha_cluster_repos'" when: ha_cluster_hacluster_password is defined ansible.builtin.set_fact: - __sap_ha_pacemaker_cluster_hacluster_password: "{{ ha_cluster_hacluster_password }}" + __sap_ha_pacemaker_cluster_hacluster_user_password: "{{ ha_cluster_hacluster_password }}" no_log: true # handle credentials with care # ha_cluster_repos diff --git a/roles/sap_ha_pacemaker_cluster/tasks/include_construct_vip_resources.yml b/roles/sap_ha_pacemaker_cluster/tasks/include_construct_vip_resources.yml index 7d2d2ad03..2ef69df6e 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/include_construct_vip_resources.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/include_construct_vip_resources.yml @@ -12,13 +12,13 @@ } }}" nwas_abap_ascs_ers: "{{ { - sap_ha_pacemaker_cluster_vip_netweaver_ascs_resource_name: sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address | regex_replace('/.*', ''), - sap_ha_pacemaker_cluster_vip_netweaver_ers_resource_name: sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address | regex_replace('/.*', '') + sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_resource_name: sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address | regex_replace('/.*', ''), + sap_ha_pacemaker_cluster_vip_nwas_abap_ers_resource_name: sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address | regex_replace('/.*', '') } }}" nwas_abap_pas_aas: "{{ { - sap_ha_pacemaker_cluster_vip_netweaver_pas_resource_name: sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address | regex_replace('/.*', ''), - sap_ha_pacemaker_cluster_vip_netweaver_aas_resource_name: sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address | regex_replace('/.*', '') + sap_ha_pacemaker_cluster_vip_nwas_abap_pas_resource_name: sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address | regex_replace('/.*', ''), + sap_ha_pacemaker_cluster_vip_nwas_abap_aas_resource_name: sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address | regex_replace('/.*', '') } }}" - name: "SAP HA Prepare Pacemaker - Combine VIP parameters" diff --git a/roles/sap_ha_pacemaker_cluster/tasks/include_vars_netweaver.yml b/roles/sap_ha_pacemaker_cluster/tasks/include_vars_nwas.yml similarity index 100% rename from roles/sap_ha_pacemaker_cluster/tasks/include_vars_netweaver.yml rename to roles/sap_ha_pacemaker_cluster/tasks/include_vars_nwas.yml diff --git a/roles/sap_ha_pacemaker_cluster/tasks/main.yml b/roles/sap_ha_pacemaker_cluster/tasks/main.yml index efcb6aed0..5aba3f387 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/main.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/main.yml @@ -63,13 +63,13 @@ - name: "SAP HA Prepare Pacemaker - Include variable construction for SAP NetWeaver common" ansible.builtin.include_tasks: - file: construct_vars_netweaver_common.yml + file: construct_vars_nwas_common.yml when: - "'nwas_abap' in sap_ha_pacemaker_cluster_host_type[0]" - name: "SAP HA Prepare Pacemaker - Include variable construction for SAP NetWeaver ABAP ASCS/ERS" ansible.builtin.include_tasks: - file: construct_vars_netweaver_abap_ascs_ers.yml + file: construct_vars_nwas_abap_ascs_ers.yml loop: "{{ sap_ha_pacemaker_cluster_host_type }}" loop_control: loop_var: nwas_build_item @@ -78,7 +78,7 @@ - name: "SAP HA Prepare Pacemaker - Include variable construction for SAP NetWeaver ABAP PAS/AAS" ansible.builtin.include_tasks: - file: construct_vars_netweaver_abap_pas_aas.yml + file: construct_vars_nwas_abap_pas_aas.yml loop: "{{ sap_ha_pacemaker_cluster_host_type }}" loop_control: loop_var: nwas_build_item @@ -87,7 +87,7 @@ - name: "SAP HA Prepare Pacemaker - Include variable construction for SAP NetWeaver Java SCS/ERS" ansible.builtin.include_tasks: - file: construct_vars_netweaver_java_scs_ers.yml + file: construct_vars_nwas_java_scs_ers.yml loop: "{{ sap_ha_pacemaker_cluster_host_type }}" loop_control: loop_var: nwas_build_item @@ -202,7 +202,7 @@ - name: "SAP HA Install Pacemaker - Include NetWeaver ASCS/ERS post installation" ansible.builtin.include_tasks: - file: configure_netweaver_ascs_ers_postinstallation.yml + file: configure_nwas_ascs_ers_postinstallation.yml apply: tags: nwas_postinst tags: nwas_postinst diff --git a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml index 244532aeb..e5f7716e6 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml @@ -65,7 +65,7 @@ value: "{{ lb_port_for_hc | default(0) }}" # Add default to ensure skip without errors - name: nc value: "{{ __sap_ha_pacemaker_cluster_register_socat_path.stdout }}" - loop: ["626{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}", "626{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}"] + loop: ["626{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}", "626{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}"] loop_control: loop_var: lb_port_for_hc index_var: lb_port_for_hc_index diff --git a/roles/sap_ha_pacemaker_cluster/tasks/validate_input_parameters.yml b/roles/sap_ha_pacemaker_cluster/tasks/validate_input_parameters.yml index 00bfc6eec..07cce5772 100644 --- a/roles/sap_ha_pacemaker_cluster/tasks/validate_input_parameters.yml +++ b/roles/sap_ha_pacemaker_cluster/tasks/validate_input_parameters.yml @@ -36,11 +36,11 @@ - name: "SAP HA Prepare Pacemaker - (SAP NetWeaver) Validate SAP System ID" ansible.builtin.assert: that: - - sap_ha_pacemaker_cluster_netweaver_sid | length == 3 - - sap_ha_pacemaker_cluster_netweaver_sid not in __sap_sid_prohibited + - sap_ha_pacemaker_cluster_nwas_abap_sid | length == 3 + - sap_ha_pacemaker_cluster_nwas_abap_sid not in __sap_sid_prohibited fail_msg: | Host type = {{ sap_ha_pacemaker_cluster_host_type }} - Requires 'sap_ha_pacemaker_cluster_netweaver_sid' to be defined! + Requires 'sap_ha_pacemaker_cluster_nwas_abap_sid' to be defined! when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas') | length > 0 @@ -62,15 +62,15 @@ Host type = {{ sap_ha_pacemaker_cluster_host_type }} Requires the ASCS/ERS instance numbers to be defined: - - sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number - - sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number + - sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr + - sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr The instance number must be exactly 2 digits. Add quotes if the number starts with a 0! loop: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_instance_number }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_instance_number }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}" loop_control: loop_var: ascs_ers_nr_item @@ -111,35 +111,35 @@ - name: "SAP HA Prepare Pacemaker - (NetWeaver ASCS) Verify that the VIP is defined" ansible.builtin.assert: that: - - sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address is defined - - sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address | length > 0 - fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_netweaver_ascs_ip_address' is not defined." + - sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address is defined + - sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address | length > 0 + fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_nwas_abap_ascs_ip_address' is not defined." when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas_abap_ascs') | length > 0 - name: "SAP HA Prepare Pacemaker - (NetWeaver ERS) Verify that the VIP is defined" ansible.builtin.assert: that: - - sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address is defined - - sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address | length > 0 - fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_netweaver_ers_ip_address' is not defined." + - sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address is defined + - sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address | length > 0 + fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_nwas_abap_ers_ip_address' is not defined." when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas_abap_ascs_ers') | length > 0 - name: "SAP HA Prepare Pacemaker - (NetWeaver PAS) Verify that the VIP is defined" ansible.builtin.assert: that: - - sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address is defined - - sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address | length > 0 - fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_netweaver_pas_ip_address' is not defined." + - sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address is defined + - sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address | length > 0 + fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_nwas_abap_pas_ip_address' is not defined." when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas_abap_pas') | length > 0 - name: "SAP HA Prepare Pacemaker - (NetWeaver AAS) Verify that the ERS VIP is defined" ansible.builtin.assert: that: - - sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address is defined - - sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address | length > 0 - fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_netweaver_aas_ip_address' is not defined." + - sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address is defined + - sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address | length > 0 + fail_msg: "Host type = '{{ sap_ha_pacemaker_cluster_host_type }}', but 'sap_ha_pacemaker_cluster_vip_nwas_abap_aas_ip_address' is not defined." when: - sap_ha_pacemaker_cluster_host_type | select('search', 'nwas_abap_pas_aas') | length > 0 diff --git a/roles/sap_ha_pacemaker_cluster/vars/main.yml b/roles/sap_ha_pacemaker_cluster/vars/main.yml index 22384d3de..e0dbd3eb6 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/main.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/main.yml @@ -53,7 +53,7 @@ __sap_ha_pacemaker_cluster_platform: '' # # Never set defaults for these: #__sap_ha_pacemaker_cluster_cluster_name: -#__sap_ha_pacemaker_cluster_hacluster_password: +#__sap_ha_pacemaker_cluster_hacluster_user_password: # Pre-define internal optional parameters to avoid defaults in the code: diff --git a/roles/sap_ha_pacemaker_cluster/vars/nwas_abap_ascs_ers.yml b/roles/sap_ha_pacemaker_cluster/vars/nwas_abap_ascs_ers.yml index 46e12821a..2daf0d2b5 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/nwas_abap_ascs_ers.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/nwas_abap_ascs_ers.yml @@ -1,8 +1,15 @@ --- -#sap_ha_pacemaker_cluster_vip_resource_name: "vip_{{ sap_ha_pacemaker_cluster_netweaver_sid }}" +#sap_ha_pacemaker_cluster_vip_resource_name: "vip_{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}" + +# The following directories are appended to the 'nfs_path' of the '/usr/sap' storage +# definition. +# Therefore, the /usr/sap prefix must be left out of the listed path items. +__sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_filesystems: + - "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}/ASCS{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_instance_nr }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_sid }}/ERS{{ sap_ha_pacemaker_cluster_nwas_abap_ers_instance_nr }}" # List of ASCS/ERS profile names. -# Used in tasks/configure_netweaver_postinstallation.yml for sap_cluster_connector setup. -__sap_ha_pacemaker_cluster_netweaver_abap_ascs_ers_profile_paths: - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ascs_sapinstance_start_profile_string }}" - - "{{ sap_ha_pacemaker_cluster_netweaver_abap_ers_sapinstance_start_profile_string }}" +# Used in tasks/configure_nwas_postinstallation.yml for sap_cluster_connector setup. +__sap_ha_pacemaker_cluster_nwas_abap_ascs_ers_profile_paths: + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ascs_sapinstance_start_profile_string }}" + - "{{ sap_ha_pacemaker_cluster_nwas_abap_ers_sapinstance_start_profile_string }}" diff --git a/roles/sap_ha_pacemaker_cluster/vars/redhat.yml b/roles/sap_ha_pacemaker_cluster/vars/redhat.yml index e8bcccc3c..dcf8452bc 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/redhat.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/redhat.yml @@ -8,7 +8,7 @@ __sap_ha_pacemaker_cluster_repos: __sap_ha_pacemaker_cluster_halib_package: sap-cluster-connector # List of configuration lines that must be added to the instance profiles. -# Used in tasks/configure_netweaver_ascs_ers_postinstallation.yml for SAP HAlib setup. +# Used in tasks/configure_nwas_ascs_ers_postinstallation.yml for SAP HA Interface setup. __sap_ha_pacemaker_cluster_connector_config_lines: - "service/halib = $(DIR_EXECUTABLE)/saphascriptco.so" - "service/halib_cluster_connector = /usr/bin/sap_cluster_connector" diff --git a/roles/sap_ha_pacemaker_cluster/vars/suse.yml b/roles/sap_ha_pacemaker_cluster/vars/suse.yml index 33314e950..c821de804 100644 --- a/roles/sap_ha_pacemaker_cluster/vars/suse.yml +++ b/roles/sap_ha_pacemaker_cluster/vars/suse.yml @@ -2,7 +2,7 @@ __sap_ha_pacemaker_cluster_halib_package: sap-suse-cluster-connector # List of configuration lines that must be added to the instance profiles. -# Used in tasks/configure_netweaver_ascs_ers_postinstallation.yml for SAP HAlib setup. +# Used in tasks/configure_nwas_ascs_ers_postinstallation.yml for SAP HA Interface setup. __sap_ha_pacemaker_cluster_connector_config_lines: - "service/halib = $(DIR_EXECUTABLE)/saphascriptco.so" - "service/halib_cluster_connector = /usr/bin/sap_suse_cluster_connector"