Merge branch 'master' of ssh://github.com/SUSE/ha-sap-terraform-deployments

yeoldegrove · yeoldegrove · commit 2b34d1f89358 · 2022-03-23T09:23:26.000+01:00
diff --git a/aws/infrastructure.tf b/aws/infrastructure.tf
@@ -33,18 +33,6 @@ locals {
   for index in range(2) : cidrsubnet(local.vpc_address_range, 8, index + var.hana_count + 2 + 1)]
 }
 
-# EFS storage for nfs share used by Netweaver for /usr/sap/{sid} and /sapmnt
-# It will be created for netweaver only when drbd is disabled
-resource "aws_efs_file_system" "netweaver-efs" {
-  count            = var.netweaver_enabled == true && var.drbd_enabled == false ? 1 : 0
-  creation_token   = "${local.deployment_name}-netweaver-efs"
-  performance_mode = var.netweaver_efs_performance_mode
-
-  tags = {
-    Name = "${local.deployment_name}-efs"
-  }
-}
-
 # AWS key pair
 resource "aws_key_pair" "key-pair" {
   key_name   = "${local.deployment_name} - terraform"
diff --git a/aws/main.tf b/aws/main.tf
@@ -125,7 +125,7 @@ module "common_variables" {
   netweaver_swpm_sar                  = var.netweaver_swpm_sar
   netweaver_sapexe_folder             = var.netweaver_sapexe_folder
   netweaver_additional_dvds           = var.netweaver_additional_dvds
-  netweaver_nfs_share                 = var.drbd_enabled ? "${local.drbd_cluster_vip}:/${var.netweaver_sid}" : "${join("", aws_efs_file_system.netweaver-efs.*.dns_name)}:"
+  netweaver_nfs_share                 = var.drbd_enabled ? "${local.drbd_cluster_vip}:/${var.netweaver_sid}" : var.netweaver_nfs_share
   netweaver_sapmnt_path               = var.netweaver_sapmnt_path
   netweaver_hana_ip                   = var.hana_ha_enabled ? local.hana_cluster_vip : element(local.hana_ips, 0)
   netweaver_hana_sid                  = var.hana_sid
@@ -227,8 +227,7 @@ module "netweaver_node" {
   key_name              = aws_key_pair.key-pair.key_name
   security_group_id     = local.security_group_id
   route_table_id        = aws_route_table.route-table.id
-  efs_enable_mount      = var.netweaver_enabled == true && var.drbd_enabled == false ? true : false
-  efs_file_system_id    = join("", aws_efs_file_system.netweaver-efs.*.id)
+  efs_performance_mode  = var.netweaver_efs_performance_mode
   aws_credentials       = var.aws_credentials
   aws_access_key_id     = var.aws_access_key_id
   aws_secret_access_key = var.aws_secret_access_key
diff --git a/aws/modules/netweaver_node/main.tf b/aws/modules/netweaver_node/main.tf
@@ -1,8 +1,9 @@
 locals {
-  vm_count        = var.xscs_server_count + var.app_server_count
-  create_ha_infra = local.vm_count > 1 && var.common_variables["netweaver"]["ha_enabled"] ? 1 : 0
-  app_start_index = local.create_ha_infra == 1 ? 2 : 1
-  hostname        = var.common_variables["deployment_name_in_hostname"] ? format("%s-%s", var.common_variables["deployment_name"], var.name) : var.name
+  vm_count           = var.xscs_server_count + var.app_server_count
+  create_ha_infra    = local.vm_count > 1 && var.common_variables["netweaver"]["ha_enabled"] ? 1 : 0
+  app_start_index    = local.create_ha_infra == 1 ? 2 : 1
+  hostname           = var.common_variables["deployment_name_in_hostname"] ? format("%s-%s", var.common_variables["deployment_name"], var.name) : var.name
+  shared_storage_efs = var.common_variables["netweaver"]["shared_storage_type"] == "efs" ? 1 : 0
 }
 
 # Network resources: subnets, routes, etc
@@ -54,9 +55,21 @@ resource "aws_route" "nw-app-route" {
   network_interface_id   = aws_instance.netweaver[local.app_start_index + count.index].primary_network_interface_id
 }
 
+# EFS storage for nfs share used by Netweaver for /usr/sap/{sid} and /sapmnt
+# It will be created for netweaver only when drbd is disabled
+resource "aws_efs_file_system" "netweaver-efs" {
+  count            = local.vm_count > 0 ? local.shared_storage_efs : 0
+  creation_token   = "${var.common_variables["deployment_name"]}-netweaver-efs"
+  performance_mode = var.efs_performance_mode
+
+  tags = {
+    Name = "${var.common_variables["deployment_name"]}-efs"
+  }
+}
+
 resource "aws_efs_mount_target" "netweaver-efs-mount-target" {
-  count           = local.vm_count > 0 && var.efs_enable_mount ? min(local.vm_count, 2) : 0
-  file_system_id  = var.efs_file_system_id
+  count           = local.vm_count > 0 && local.shared_storage_efs == 1 ? min(local.vm_count, 2) : 0
+  file_system_id  = aws_efs_file_system.netweaver-efs.0.id
   subnet_id       = element(aws_subnet.netweaver-subnet.*.id, count.index)
   security_groups = [var.security_group_id]
 }
diff --git a/aws/modules/netweaver_node/salt_provisioner.tf b/aws/modules/netweaver_node/salt_provisioner.tf
@@ -42,6 +42,8 @@ iscsi_srv_ip: ${var.iscsi_srv_ip}
 app_server_count: ${var.app_server_count}
 netweaver_inst_disk_device: /dev/nvme1n1
 s3_bucket: ${var.s3_bucket}
+efs_mount_ip:
+  sapmnt: [ ${local.shared_storage_efs == 1 ? join("", aws_efs_file_system.netweaver-efs.*.dns_name) : ""} ]
   EOF
     destination = "/tmp/grains"
   }
diff --git a/aws/modules/netweaver_node/variables.tf b/aws/modules/netweaver_node/variables.tf
@@ -61,14 +61,10 @@ variable "route_table_id" {
   description = "Route table id"
 }
 
-variable "efs_enable_mount" {
-  type        = bool
-  description = "Enable the mount operation on the EFS storage"
-}
-
-variable "efs_file_system_id" {
+variable "efs_performance_mode" {
   type        = string
-  description = "AWS efs file system ID to be used by EFS mount target"
+  description = "Performance mode of the EFS storage used by Netweaver"
+  default     = "generalPurpose"
 }
 
 variable "aws_credentials" {
diff --git a/aws/terraform.tfvars.example b/aws/terraform.tfvars.example
@@ -335,8 +335,6 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
 #netweaver_os_image = "suse-sles-sap-15-sp1-byos"
 #netweaver_os_owner = "amazon"
 
-#AWS efs performance mode used by netweaver nfs share, if efs storage is used
-#netweaver_efs_performance_mode = "generalPurpose"
 #netweaver_ips = ["10.0.2.7", "10.0.3.8", "10.0.2.9", "10.0.3.10"]
 #netweaver_virtual_ips = ["192.168.1.20", "192.168.1.21", "192.168.1.22", "192.168.1.23"]
 
@@ -381,6 +379,14 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
 # Example:
 #netweaver_product_id = "NW750.HDB.ABAPHA"
 
+#########################
+# Netweaver shared storage variables
+# Needed if Netweaver is deployed HA
+#########################
+#netweaver_shared_storage_type      = "efs"  # drbd,efs supported at the moment (default: "efs")
+#AWS efs performance mode used by netweaver nfs share, if efs storage is used
+#netweaver_efs_performance_mode = "generalPurpose"
+
 # Path where netweaver sapmnt data is stored.
 #netweaver_sapmnt_path = "/sapmnt"
 
diff --git a/aws/variables.tf b/aws/variables.tf
@@ -805,6 +805,12 @@ variable "netweaver_cluster_fencing_mechanism" {
   }
 }
 
+variable "netweaver_nfs_share" {
+  description = "URL of the NFS share where /sapmnt and /usr/sap/{sid}/SYS will be mounted. This folder must have the sapmnt and usrsapsys folders. This parameter can be omitted if drbd_enabled is set to true, as a HA nfs share will be deployed by the project. Finally, if it is not used or set empty, these folders are created locally (for single machine deployments)"
+  type        = string
+  default     = ""
+}
+
 variable "netweaver_sapmnt_path" {
   description = "Path where sapmnt folder is stored"
   type        = string
@@ -866,14 +872,14 @@ variable "netweaver_ha_enabled" {
 }
 
 variable "netweaver_shared_storage_type" {
-  description = "shared Storage type to use for Netweaver deployment - not supported yet for this cloud provider yet"
+  description = "shared Storage type to use for Netweaver deployment"
   type        = string
-  default     = ""
+  default     = "efs"
   validation {
     condition = (
-      can(regex("^(|)$", var.netweaver_shared_storage_type))
+      can(regex("^(drbd|efs)$", var.netweaver_shared_storage_type))
     )
-    error_message = "Invalid Netweaver shared storage type. Options: none."
+    error_message = "Invalid Netweaver shared storage type. Options: drbd|efs."
   }
 }
 
diff --git a/doc/netweaver.md b/doc/netweaver.md
@@ -11,11 +11,11 @@ The deployment will create 4 new virtual machines to host the NetWeaver environm
 
 Besides the standard installation, an additional HA cluster might be added in top of the ASCS and ERS communication to assure high availability between these two components using the *sap_suse_cluster_connector* (HA is enabled by default).
 
-More details in the official Suse documentation: 
+More details in the official Suse documentation:
 
-[SAP NetWeaver Enqueue Replication 1 High Availability Cluster - Setup Guide for SAP NetWeaver 7.40 and 7.50](https://documentation.suse.com/sbp/all/html/SAP_NW740_SLE15_SetupGuide/index.html) [pdf (en)](https://documentation.suse.com/sbp/all/pdf/SAP_NW740_SLE15_SetupGuide_color_en.pdf)
+[SAP NetWeaver Enqueue Replication 1 High Availability Cluster - Setup Guide for SAP NetWeaver 7.40 and 7.50](https://documentation.suse.com/sbp/all/html/SAP-nw740-sle15-setupguide/index.html) [pdf (en)](https://documentation.suse.com/sbp/all/pdf/SAP-nw740-sle15-setupguide_color_en.pdf)
 
-[SAP S/4 HANA - Enqueue Replication 2 High Availability Cluster - Setup Guide](https://documentation.suse.com/sbp/all/html/SAP_S4HA10_SetupGuide-SLE15/index.html)
+[SAP S/4 HANA - Enqueue Replication 2 High Availability Cluster - Setup Guide](https://documentation.suse.com/sbp/all/html/SAP-S4HA10-setupguide-sle15/index.html) [pdf (en)](https://documentation.suse.com/sbp/all/pdf/SAP-S4HA10-setupguide-sle15_color_en.pdf)
 
 The deployment is performed using the [sapnwbootstrap-formula](https://github.com/SUSE/sapnwbootstrap-formula).
 
diff --git a/gcp/infrastructure.tf b/gcp/infrastructure.tf
@@ -11,6 +11,8 @@ data "google_compute_subnetwork" "current-subnet" {
 
 locals {
   deployment_name = var.deployment_name != "" ? var.deployment_name : terraform.workspace
+  # only use 2 compute zones to have an even distribution of nodes
+  compute_zones = slice(data.google_compute_zones.available.names, 0, 2)
 
   network_link = var.vpc_name == "" ? google_compute_network.ha_network.0.self_link : format(
   "https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", var.project, var.vpc_name)
@@ -58,19 +60,21 @@ resource "google_compute_firewall" "ha_firewall_allow_internal" {
 }
 
 resource "google_compute_firewall" "ha_firewall_allow_icmp" {
-  count   = local.create_firewall
-  name    = "${local.deployment_name}-fw-icmp"
-  network = local.vpc_name
+  count         = local.create_firewall
+  name          = "${local.deployment_name}-fw-icmp"
+  network       = local.vpc_name
+  source_ranges = ["0.0.0.0/0"]
 
   allow {
     protocol = "icmp"
   }
 }
 
 resource "google_compute_firewall" "ha_firewall_allow_tcp" {
-  count   = local.create_firewall
-  name    = "${local.deployment_name}-fw-tcp"
-  network = local.vpc_name
+  count         = local.create_firewall
+  name          = "${local.deployment_name}-fw-tcp"
+  network       = local.vpc_name
+  source_ranges = ["0.0.0.0/0"]
 
   allow {
     protocol = "tcp"
@@ -88,7 +92,7 @@ module "bastion" {
   region             = var.region
   os_image           = local.bastion_os_image
   vm_size            = "custom-1-2048"
-  compute_zones      = data.google_compute_zones.available.names
+  compute_zones      = local.compute_zones
   network_link       = local.network_link
   snet_address_range = cidrsubnet(cidrsubnet(local.subnet_address_range, -4, 0), 4, 2)
 }
diff --git a/gcp/main.tf b/gcp/main.tf
@@ -175,7 +175,7 @@ module "drbd_node" {
   bastion_host         = module.bastion.public_ip
   drbd_count           = var.drbd_enabled == true ? 2 : 0
   machine_type         = var.drbd_machine_type
-  compute_zones        = data.google_compute_zones.available.names
+  compute_zones        = local.compute_zones
   network_name         = local.vpc_name
   network_subnet_name  = local.subnet_name
   os_image             = local.drbd_os_image
@@ -203,7 +203,7 @@ module "netweaver_node" {
   xscs_server_count         = local.netweaver_xscs_server_count
   app_server_count          = var.netweaver_enabled ? var.netweaver_app_server_count : 0
   machine_type              = var.netweaver_machine_type
-  compute_zones             = data.google_compute_zones.available.names
+  compute_zones             = local.compute_zones
   network_name              = local.vpc_name
   network_subnet_name       = local.subnet_name
   os_image                  = local.netweaver_os_image
@@ -228,7 +228,7 @@ module "hana_node" {
   bastion_host          = module.bastion.public_ip
   hana_count            = var.hana_count
   machine_type          = var.machine_type
-  compute_zones         = data.google_compute_zones.available.names
+  compute_zones         = local.compute_zones
   network_name          = local.vpc_name
   network_subnet_name   = local.subnet_name
   os_image              = local.hana_os_image
@@ -255,7 +255,7 @@ module "monitoring" {
   network_domain      = var.monitoring_network_domain == "" ? var.network_domain : var.monitoring_network_domain
   bastion_host        = module.bastion.public_ip
   monitoring_enabled  = var.monitoring_enabled
-  compute_zones       = data.google_compute_zones.available.names
+  compute_zones       = local.compute_zones
   network_subnet_name = local.subnet_name
   os_image            = local.monitoring_os_image
   monitoring_srv_ip   = local.monitoring_srv_ip
@@ -274,7 +274,7 @@ module "iscsi_server" {
   bastion_host        = module.bastion.public_ip
   iscsi_count         = local.iscsi_enabled == true ? 1 : 0
   machine_type        = var.machine_type_iscsi_server
-  compute_zones       = data.google_compute_zones.available.names
+  compute_zones       = local.compute_zones
   network_subnet_name = local.subnet_name
   os_image            = local.iscsi_os_image
   host_ips            = [local.iscsi_srv_ip]
diff --git a/generic_modules/common_variables/netweaver_variables.tf b/generic_modules/common_variables/netweaver_variables.tf
@@ -172,8 +172,8 @@ variable "netweaver_shared_storage_type" {
   type        = string
   validation {
     condition = (
-      can(regex("^(|drbd|anf|nfs)$", var.netweaver_shared_storage_type))
+      can(regex("^(|drbd|anf|efs|nfs)$", var.netweaver_shared_storage_type))
     )
-    error_message = "Invalid Netweaver shared storage type. Options: drbd|anf|nfs."
+    error_message = "Invalid Netweaver shared storage type. Options: drbd|anf|efs|nfs."
   }
 }
diff --git a/pillar_examples/automatic/netweaver/cluster.sls b/pillar_examples/automatic/netweaver/cluster.sls
@@ -65,6 +65,11 @@ cluster:
         ascs_fstype: xfs
         ers_device: {{ netweaver.netweaver.nodes[1].shared_disk_dev }}3
         ers_fstype: xfs
+        {%- elif grains['provider'] == 'aws' and grains['netweaver_shared_storage_type'] == 'efs' %}
+        ascs_device: {{ grains['efs_mount_ip']['sapmnt'][0] }}:/ASCS
+        ascs_fstype: nfs4
+        ers_device: {{ grains['efs_mount_ip']['sapmnt'][0] }}:/ERS
+        ers_fstype: nfs4
         {%- elif grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
         ascs_device: {{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver-sapmnt/ASCS
         ascs_fstype: nfs4
diff --git a/pillar_examples/automatic/netweaver/netweaver.sls b/pillar_examples/automatic/netweaver/netweaver.sls
@@ -41,7 +41,9 @@ netweaver:
   sid_adm_password: {{ grains['netweaver_master_password'] }}
   sap_adm_password: {{ grains['netweaver_master_password'] }}
   master_password: {{ grains['netweaver_master_password'] }}
-  {%- if grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
+  {%- if grains['provider'] == 'aws' and grains['netweaver_shared_storage_type'] == 'efs' %}
+  sapmnt_inst_media: "{{ grains['efs_mount_ip']['sapmnt'][0] }}:/"
+  {%- elif grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
   sapmnt_inst_media: "{{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver-sapmnt"
   {%- else %}
   sapmnt_inst_media: "{{ grains['netweaver_nfs_share'] }}"
@@ -108,7 +110,9 @@ netweaver:
       shared_disk_dev: /dev/vdb
       init_shared_disk: True
       {%- elif grains['ha_enabled'] %}
-      {%- if grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
+      {%- if grains['provider'] == 'aws' and grains['netweaver_shared_storage_type'] == 'efs' %}
+      shared_disk_dev: {{ grains['efs_mount_ip']['sapmnt'][0] }}:/ASCS
+      {%- elif grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
       shared_disk_dev: {{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver-sapmnt/ASCS
       {%- elif grains['provider'] == 'openstack' and grains['netweaver_shared_storage_type'] == 'nfs' %}
       shared_disk_dev: {{ grains['netweaver_nfs_share'] }}/ASCS{{ '{:0>2}'.format(grains['ascs_instance_number']) }}
@@ -130,7 +134,9 @@ netweaver:
       {%- if grains['provider'] == 'libvirt' %}
       shared_disk_dev: /dev/vdb
       {%- else %}
-      {%- if grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
+      {%- if grains['provider'] == 'aws' and grains['netweaver_shared_storage_type'] == 'efs' %}
+      shared_disk_dev: {{ grains['efs_mount_ip']['sapmnt'][0] }}:/ERS
+      {%- elif grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %}
       shared_disk_dev: {{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver-sapmnt/ERS
       {%- elif grains['provider'] == 'openstack' and grains['netweaver_shared_storage_type'] == 'nfs' %}
       shared_disk_dev: {{ grains['netweaver_nfs_share'] }}/ERS{{ '{:0>2}'.format(grains['ers_instance_number']) }}
diff --git a/requirements.yml b/requirements.yml
@@ -2,19 +2,19 @@
 hana_node:
   python-shaptools: 0.3.12+git.1619007514.1951d23
   python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.14+git.1643874204.627d53a
+  salt-shaptools: 0.3.15+git.1647616051.329993c
   habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
   saphanabootstrap-formula: 0.9.0+git.1644311138.1ee99f3
 drbd_node:
   python-shaptools: 0.3.12+git.1619007514.1951d23
   python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.14+git.1643874204.627d53a
+  salt-shaptools: 0.3.15+git.1647616051.329993c
   habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
   drbd-formula: 0.5.0+git.1637569723.cf85049
 netweaver_node:
   python-shaptools: 0.3.12+git.1619007514.1951d23
   python3-shaptools: 0.3.12+git.1619007514.1951d23
-  salt-shaptools: 0.3.14+git.1643874204.627d53a
+  salt-shaptools: 0.3.15+git.1647616051.329993c
   habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
   sapnwbootstrap-formula: 0.7.4+git.1646147057.78b198a
 iscsi_srv:
diff --git a/salt/netweaver_node/nfs.sls b/salt/netweaver_node/nfs.sls
@@ -2,7 +2,7 @@
 # https://docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/high-availability-guide-suse-nfs
 # Maybe it should go in the netweaver salt formula directly
 
-{% if grains['netweaver_nfs_share'] or grains['netweaver_shared_storage_type'] == "anf" %}
+{% if grains['netweaver_nfs_share'] or grains['netweaver_shared_storage_type'] == "efs" or grains['netweaver_shared_storage_type'] == "anf" %}
 
 include:
   - shared_storage.nfs
diff --git a/salt/shared_storage/nfs.sls b/salt/shared_storage/nfs.sls
@@ -58,7 +58,13 @@ include:
       {% set nfs_share = grains['netweaver_nfs_share'] %}
     {% endif %}
     # overwrite netweaver nfs variables on a per cloud provider and scenario basis
-    {% if grains['provider'] == 'azure' %}
+    {% if grains['provider'] == 'aws' %}
+      {% if grains['netweaver_shared_storage_type'] == "efs" %}
+        # define IPs and share
+        {% set nfs_server_ip = grains['efs_mount_ip'][mount][0] %}
+        {% set nfs_share = nfs_server_ip + ':/' %}
+      {% endif %}
+    {% elif grains['provider'] == 'azure' %}
       {% if grains['netweaver_shared_storage_type'] == "anf" %}
         # define IPs and share
         {% set nfs_server_ip = grains['anf_mount_ip'][mount][0] %}
@@ -72,7 +78,13 @@ include:
       {% endif %}
     {% endif %}
   {% elif grains['role'] == "hana_node" %}
-    {% if grains['provider'] == 'azure' %}
+    {% if grains['provider'] == 'aws' %}
+      {% if grains['hana_scale_out_enabled'] and grains['hana_scale_out_shared_storage_type'] == "efs" %}
+        # define IPs and share
+        {% set nfs_server_ip = grains['efs_mount_ip'][mount][site - 1] %}
+        {% set nfs_share = nfs_server_ip + ':/' + grains['name_prefix'] + '-' + mount + '-' + site|string %}
+      {% endif %}
+    {% elif grains['provider'] == 'azure' %}
       {% if grains['hana_scale_out_enabled'] and grains['hana_scale_out_shared_storage_type'] == "anf" %}
         # define IPs and share
         {% set nfs_server_ip = grains['anf_mount_ip'][mount][site - 1] %}

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ iscsi_srv_ip: ${var.iscsi_srv_ip}`
`42`	`42`	`app_server_count: ${var.app_server_count}`
`43`	`43`	`netweaver_inst_disk_device: /dev/nvme1n1`
`44`	`44`	`s3_bucket: ${var.s3_bucket}`
	`45`	`+efs_mount_ip:`
	`46`	`+ sapmnt: [ ${local.shared_storage_efs == 1 ? join("", aws_efs_file_system.netweaver-efs.*.dns_name) : ""} ]`
`45`	`47`	`EOF`
`46`	`48`	`destination = "/tmp/grains"`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -805,6 +805,12 @@ variable "netweaver_cluster_fencing_mechanism" {`
`805`	`805`	`}`
`806`	`806`	`}`
`807`	`807`
	`808`	`+variable "netweaver_nfs_share" {`
	`809`	`+ description = "URL of the NFS share where /sapmnt and /usr/sap/{sid}/SYS will be mounted. This folder must have the sapmnt and usrsapsys folders. This parameter can be omitted if drbd_enabled is set to true, as a HA nfs share will be deployed by the project. Finally, if it is not used or set empty, these folders are created locally (for single machine deployments)"`
	`810`	`+ type = string`
	`811`	`+ default = ""`
	`812`	`+}`
	`813`	`+`
`808`	`814`	`variable "netweaver_sapmnt_path" {`
`809`	`815`	`description = "Path where sapmnt folder is stored"`
`810`	`816`	`type = string`
`@@ -866,14 +872,14 @@ variable "netweaver_ha_enabled" {`
`866`	`872`	`}`
`867`	`873`
`868`	`874`	`variable "netweaver_shared_storage_type" {`
`869`		`- description = "shared Storage type to use for Netweaver deployment - not supported yet for this cloud provider yet"`
	`875`	`+ description = "shared Storage type to use for Netweaver deployment"`
`870`	`876`	`type = string`
`871`		`- default = ""`
	`877`	`+ default = "efs"`
`872`	`878`	`validation {`
`873`	`879`	`condition = (`
`874`		`- can(regex("^(\|)$", var.netweaver_shared_storage_type))`
	`880`	`+ can(regex("^(drbd\|efs)$", var.netweaver_shared_storage_type))`
`875`	`881`	`)`
`876`		`- error_message = "Invalid Netweaver shared storage type. Options: none."`
	`882`	`+ error_message = "Invalid Netweaver shared storage type. Options: drbd\|efs."`
`877`	`883`	`}`
`878`	`884`	`}`
`879`	`885`