Remove use_sbd from the inventory

Remove Terraform code that write use_sbd to the Ansible inventory.

Author: mpagot

terraform/aws/inventory.tmpl

@@ -1,7 +1,6 @@
 all:
   vars:
     cloud_platform_name: aws
-    use_sbd: ${use_sbd}
     aws_route_table_id: ${routetable_id}
     cluster_ip: ${cluster_ip}
     aws_stonith_tag: ${stonith_tag}

terraform/aws/outputs.tf

@@ -112,7 +112,6 @@ resource "local_file" "ansible_inventory" {
       iscsi_enabled       = local.iscsi_enabled,
       iscsi_remote_python = var.iscsi_remote_python,
       iscsi_machinetype   = var.iscsi_instancetype,
-      use_sbd             = local.use_sbd,
       routetable_id       = aws_route_table.route-table.id,
       cluster_ip          = local.hana_cluster_vip,
       stonith_tag         = module.hana_node.stonith_tag,

terraform/azure/inventory.tmpl

@@ -1,7 +1,6 @@
 all:
   vars:
     cloud_platform_name: azure
-    use_sbd: ${use_sbd}
     resource_group_name: ${resource_group_name}
     subscription_id: ${subscription_id}
     tenant_id: ${tenant_id}

terraform/azure/outputs.tf

@@ -111,7 +111,6 @@ resource "local_file" "ansible_inventory" {
       iscsi_pip           = module.iscsi_server.iscsisrv_public_ip,
       iscsi_enabled       = local.iscsi_enabled,
       iscsi_remote_python = var.iscsi_remote_python
-      use_sbd             = local.use_sbd
       resource_group_name = local.resource_group_name
       subscription_id     = data.azurerm_subscription.current.subscription_id
       tenant_id           = data.azurerm_subscription.current.tenant_id

terraform/gcp/inventory.tmpl

@@ -1,7 +1,6 @@
 all:
   vars:
     cloud_platform_name: gcp
-    use_sbd: ${use_sbd}
     cluster_ip: ${cluster_ip}
     prefix: ${name_prefix}
     project: ${gcp_project}

terraform/gcp/outputs.tf

@@ -114,7 +114,6 @@ resource "local_file" "ansible_inventory" {
       gcp_project         = var.project,
       gcp_primary_zone    = element(local.compute_zones, 0),
       gcp_secondary_zone  = element(local.compute_zones, 1),
-      use_sbd             = local.use_sbd
       name_prefix         = local.deployment_name,
   })
   filename = "inventory.yaml"

terraform/libvirt/main.tf

@@ -33,11 +33,6 @@ locals {
   netweaver_virtual_ips = length(var.netweaver_virtual_ips) != 0 ? var.netweaver_virtual_ips : [for ip_index in range(local.netweaver_ip_start, local.netweaver_ip_start + local.netweaver_virtual_ips_count) : cidrhost(local.iprange, ip_index + local.netweaver_virtual_ips_count)]
 
   # Check if iscsi server has to be created
-  use_sbd = (
-    var.hana_cluster_fencing_mechanism == "sbd" ||
-    var.drbd_cluster_fencing_mechanism == "sbd" ||
-    var.netweaver_cluster_fencing_mechanism == "sbd"
-  )
   iscsi_enabled = (
     var.sbd_storage_type == "iscsi" &&
     (

tools/inventory.yaml

@@ -1,6 +1,5 @@
 all:
   vars:
-    use_sbd: true
     resource_group_name: rg-name
     subscription_id: AAAAA-BBBBB-CCCCC-DDDDD
     tenant_id: EEEEE-FFFFF-GGGGG-HHHHH