Harmonize variable name for cluster_ip across CSP (#314)

SUSE · Feb 7, 2025 · e958bd7 · e958bd7
1 parent 98a757b
commit e958bd7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/ansible/playbooks/tasks/aws-cluster-bootstrap.yaml b/ansible/playbooks/tasks/aws-cluster-bootstrap.yaml
@@ -341,7 +341,7 @@
       crm configure primitive
       rsc_ip_{{ sap_hana_install_sid }}_HDB{{ sap_hana_install_instance_number }}
       ocf:suse:aws-vpc-move-ip params
-      ip={{ aws_cluster_ip }}
+      ip={{ cluster_ip }}
       routing_table={{ aws_route_table_id }}
       interface=eth0
       profile=default

diff --git a/ansible/playbooks/tasks/gcp-cluster-bootstrap.yaml b/ansible/playbooks/tasks/gcp-cluster-bootstrap.yaml
@@ -330,7 +330,7 @@
       crm configure primitive
       rsc_ip_{{ sap_hana_install_sid }}_HDB{{ sap_hana_install_instance_number }}
       IPaddr2
-      params ip={{ gcp_cluster_ip }}
+      params ip={{ cluster_ip }}
       cidr_netmask=32
       nic=eth0
       op monitor interval=3600s timeout=60s

diff --git a/terraform/aws/inventory.tmpl b/terraform/aws/inventory.tmpl
@@ -3,7 +3,7 @@ all:
     cloud_platform_name: aws
     use_sbd: ${use_sbd}
     aws_route_table_id: ${routetable_id}
-    aws_cluster_ip: ${virtual_ip}
+    cluster_ip: ${cluster_ip}
     aws_stonith_tag: ${stonith_tag}
     aws_region: ${region}
   children:

diff --git a/terraform/aws/outputs.tf b/terraform/aws/outputs.tf
@@ -107,7 +107,7 @@ resource "local_file" "ansible_inventory" {
       iscsi_remote_python = var.iscsi_remote_python,
       use_sbd             = local.use_sbd,
       routetable_id       = aws_route_table.route-table.id,
-      virtual_ip          = local.hana_cluster_vip,
+      cluster_ip          = local.hana_cluster_vip,
       stonith_tag         = module.hana_node.stonith_tag,
       region              = var.aws_region
   })

diff --git a/terraform/gcp/inventory.tmpl b/terraform/gcp/inventory.tmpl
@@ -2,7 +2,7 @@ all:
   vars:
     cloud_platform_name: gcp
     use_sbd: ${use_sbd}
-    gcp_cluster_ip: ${hana-vip}
+    cluster_ip: ${cluster_ip}
     prefix: ${name_prefix}
     project: ${gcp_project}
     primary_zone: ${gcp_primary_zone}

diff --git a/terraform/gcp/outputs.tf b/terraform/gcp/outputs.tf
@@ -100,7 +100,7 @@ resource "local_file" "ansible_inventory" {
     {
       hana_name           = module.hana_node.hana_name,
       hana_pip            = module.hana_node.hana_public_ip,
-      hana-vip            = module.hana_node.hana_vip,
+      cluster_ip          = module.hana_node.hana_vip,
       hana_remote_python  = var.hana_remote_python,
       iscsi_name          = module.iscsi_server.iscsisrv_name,
       iscsi_pip           = module.iscsi_server.iscsisrv_public_ip,