sap_ha_pacemaker_cluster: remove cidr_netmask from IPaddr2 resource d…

…efinitions and leave it to the agent
sap-linuxlab · Sep 13, 2023 · e613684 · e613684
1 parent c94ed5c
commit e613684
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 15 deletions.
diff --git a/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_vip_resources_default.yml b/roles/sap_ha_pacemaker_cluster/tasks/construct_vars_vip_resources_default.yml
@@ -13,8 +13,6 @@
         - attrs:
             - name: ip
               value: "{{ vip_list_item.value | quote }}"
-            - name: cidr_netmask
-              value: "{{ sap_ha_pacemaker_cluster_vip_cidr_netmask }}"
             - name: nic
               value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
   when:

diff --git a/roles/sap_ha_pacemaker_cluster/tasks/include_vars_common.yml b/roles/sap_ha_pacemaker_cluster/tasks/include_vars_common.yml
@@ -24,11 +24,6 @@
     - not __sap_ha_pacemaker_cluster_nic_multi_bool
     - sap_ha_pacemaker_cluster_vip_client_interface == ''
 
-- name: "SAP HA Prepare Pacemaker - Set cidr netmask of the defined interface"
-  ansible.builtin.set_fact:
-    sap_ha_pacemaker_cluster_vip_cidr_netmask: "{{ vars['ansible_' + sap_ha_pacemaker_cluster_vip_client_interface].ipv4.prefix }}"
-  when:
-    - sap_ha_pacemaker_cluster_vip_client_interface != ''
 
 # Include vars files based on the environment.
 # Respect order for potential variable precedence.

diff --git a/...sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_aws_ec2_vs.yml b/...sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_aws_ec2_vs.yml
@@ -12,8 +12,6 @@
         - attrs:
             - name: ip
               value: "{{ vip_list_item.value }}"
-            - name: cidr_netmask
-              value: "{{ sap_ha_pacemaker_cluster_vip_cidr_netmask }}"
             - name: nic
               value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
   when:

diff --git a/..._pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_ibmcloud_powervs.yml b/..._pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_ibmcloud_powervs.yml
@@ -12,8 +12,6 @@
         - attrs:
             - name: ip
               value: "{{ vip_list_item.value }}"
-            - name: cidr_netmask
-              value: "{{ sap_ha_pacemaker_cluster_vip_cidr_netmask }}"
             - name: nic
               value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
   when:

diff --git a/...sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml b/...sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_cloud_msazure_vm.yml
@@ -12,8 +12,6 @@
         - attrs:
             - name: ip
               value: "{{ vip_list_item.value }}"
-            - name: cidr_netmask
-              value: "{{ sap_ha_pacemaker_cluster_vip_cidr_netmask }}"
             - name: nic
               value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
   when:

diff --git a/.../sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_hyp_ibmpower_vm.yml b/.../sap_ha_pacemaker_cluster/tasks/platform/construct_vars_vip_resources_hyp_ibmpower_vm.yml
@@ -12,8 +12,6 @@
         - attrs:
             - name: ip
               value: "{{ vip_list_item.value }}"
-            - name: cidr_netmask
-              value: "{{ sap_ha_pacemaker_cluster_vip_cidr_netmask }}"
             - name: nic
               value: "{{ sap_ha_pacemaker_cluster_vip_client_interface }}"
   when: