fix: storage var clean

sap-linuxlab · Jan 31, 2024 · 68b0c45 · 68b0c45
1 parent 5978337
commit 68b0c45
Show file tree

Hide file tree

Showing 196 changed files with 0 additions and 901 deletions.
diff --git a/sap_bw4hana_single_node_install/aws_ec2_instance/variables.tf b/sap_bw4hana_single_node_install/aws_ec2_instance/variables.tf
@@ -49,15 +49,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars
@@ -12,10 +12,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 304
-
-disk_volume_type_software = "gp3"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/outputs_debug.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variables.tf b/sap_bw4hana_single_node_install/ibmcloud_powervs/variables.tf
@@ -66,15 +66,6 @@ variable "os_vendor_account_user_passcode" {
   description = "OS Vendor passcode (password for Red Hat, activation code for SUSE)"
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars
@@ -14,10 +14,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-1-sap-ha-byol"
 
-disk_volume_capacity_software = 304
-
-disk_volume_type_software = "tier1"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_bw4hana_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_bw4hana_single_node_install/ibmcloud_vs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_bw4hana_single_node_install/ibmcloud_vs/variables.tf b/sap_bw4hana_single_node_install/ibmcloud_vs/variables.tf
@@ -64,15 +64,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars
@@ -14,10 +14,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 304
-
-disk_volume_type_software = "10iops-tier"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_bw4hana_single_node_install/ibmpowervc/variables.tf b/sap_bw4hana_single_node_install/ibmpowervc/variables.tf
@@ -98,11 +98,6 @@ variable "os_systems_mgmt_host" {
   description = "OS Systems Management host for licensing (i.e. Red Hat Satellite). **Leave blank if using Red Hat Customer Portal (RHCP) or SUSE Customer Center (SCC)**"
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_bw4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars
@@ -4,8 +4,6 @@ bastion_user = false
 
 host_specification_plan = "small_256gb"
 
-disk_volume_capacity_software = 304
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_bw4hana_single_node_install/msazure_vm/variables.tf b/sap_bw4hana_single_node_install/msazure_vm/variables.tf
@@ -69,11 +69,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_bw4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars
@@ -12,8 +12,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 304
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_install/aws_ec2_instance/variables.tf b/sap_ecc_hana_single_node_install/aws_ec2_instance/variables.tf
@@ -49,15 +49,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars
@@ -12,10 +12,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 200
-
-disk_volume_type_software = "gp3"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/outputs_debug.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables.tf b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables.tf
@@ -66,15 +66,6 @@ variable "os_vendor_account_user_passcode" {
   description = "OS Vendor passcode (password for Red Hat, activation code for SUSE)"
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars
@@ -14,10 +14,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-1-sap-ha-byol"
 
-disk_volume_capacity_software = 200
-
-disk_volume_type_software = "tier1"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_ecc_hana_single_node_install/ibmcloud_vs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_ecc_hana_single_node_install/ibmpowervc/variables.tf b/sap_ecc_hana_single_node_install/ibmpowervc/variables.tf
@@ -98,11 +98,6 @@ variable "os_systems_mgmt_host" {
   description = "OS Systems Management host for licensing (i.e. Red Hat Satellite). **Leave blank if using Red Hat Customer Portal (RHCP) or SUSE Customer Center (SCC)**"
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_ecc_hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars
@@ -4,8 +4,6 @@ bastion_user = false
 
 host_specification_plan = "small_256gb"
 
-disk_volume_capacity_software = 200
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_install/msazure_vm/variables.tf b/sap_ecc_hana_single_node_install/msazure_vm/variables.tf
@@ -69,11 +69,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars
@@ -12,8 +12,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 200
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/outputs_debug.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables.tf
@@ -66,15 +66,6 @@ variable "os_vendor_account_user_passcode" {
   description = "OS Vendor passcode (password for Red Hat, activation code for SUSE)"
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software and any backup files"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software and any backup files"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/...single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars b/...single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars
@@ -14,10 +14,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-1-sap-ha-byol"
 
-disk_volume_capacity_software = 368
-
-disk_volume_type_software = "tier1"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/outputs_debug.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/outputs_debug.tf
@@ -17,13 +17,6 @@
 #  ]
 #}
 
-# Show value for specific variable within each Storage Test Template object
-#output "DEBUG_show_template_value_single_all_items" {
-#  value = [
-#    for key, value in var.storage_test_templates_map : value.*.disk_volume_count_hana_data
-#  ]
-#}
-
 # Show value for specific variable within each Storage Test Template, and de-duplicate e.g. unique Virtual Server Profiles used in the Storage Test Templates
 #output "DEBUG_show_storage_test_template_profiles_condense" {
 #  value = toset([

diff --git a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables.tf b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables.tf
@@ -64,15 +64,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software and any backup files"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software and any backup files"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/...hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars b/...hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars
@@ -14,10 +14,6 @@ host_specification_plan = "small_256gb"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 368
-
-disk_volume_type_software = "10iops-tier"
-
 sap_hana_install_master_password = "NewPass$321"
 
 sap_hana_install_sid = "H01"

diff --git a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/main.tf b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/main.tf
@@ -227,8 +227,6 @@ module "run_ansible_sap_ecc_ibmdb2_install" {
 
   module_var_sap_swpm_template_selected       = var.sap_swpm_template_selected
 
-  module_var_filesystem_mount_path_anydb      = var.map_host_specifications[var.host_specification_plan][each.key].disk_volume_count_anydb == 0 ? 0 : var.map_host_specifications[var.host_specification_plan][each.key].filesystem_mount_path_anydb
-
   module_var_sap_software_download_directory  = var.sap_software_download_directory
 
   module_var_terraform_host_specification_storage_definition = var.map_host_specifications[var.host_specification_plan][join(", ", each.value.*.output_host_name)]["storage_definition"]

diff --git a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables.tf b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables.tf
@@ -49,15 +49,6 @@ variable "host_os_image" {
   description = "Host OS Image. This variable uses the locals mapping with regex of OS Images, and will alter host provisioning."
 }
 
-variable "disk_volume_capacity_software" {
-  type        = number
-  description = "Disk volume capacity for downloads of SAP Software"
-}
-
-variable "disk_volume_type_software" {
-  description = "Disk volume type for downloads of SAP Software"
-}
-
 variable "sap_software_download_directory" {
   description = "Mount point for downloads of SAP Software"
 

diff --git a/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars
@@ -12,10 +12,6 @@ host_specification_plan = "small_32vcpu"
 
 host_os_image = "rhel-8-4-sap-ha"
 
-disk_volume_capacity_software = 304
-
-disk_volume_type_software = "gp3"
-
 sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations
 
 sap_anydb_install_sid = "DB2"