diff --git a/sap_bw4hana_single_node_install/aws_ec2_instance/variables.tf b/sap_bw4hana_single_node_install/aws_ec2_instance/variables.tf index d82c456..ebcd59c 100644 --- 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 index a8ffdd3..a04b64b 100644 --- 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 index d6970cd..17797ae 100644 --- 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 index d7fe217..00fb204 100644 --- 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 index 247c86f..225ddf1 100644 --- 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 index c21429d..5d9a075 100644 --- 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 index 7f6c4b2..cc4dafb 100644 --- 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 index e9b2e30..ff19e73 100644 --- 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 index bdc7604..de36ab1 100644 --- 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 index d4e90b7..be568cd 100644 --- 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 index bcd7345..3e5e3f2 100644 --- 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 index 455e97f..0d9c6c8 100644 --- 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 index 3aa4e35..eefa4e5 100644 --- 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 index b71f2dd..227cd86 100644 --- 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 index d6970cd..17797ae 100644 --- 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 index 60043f7..365a5d7 100644 --- 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 index 11e062a..177c640 100644 --- 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 index c21429d..5d9a075 100644 --- 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 index 20f4bc1..29a8b59 100644 --- 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 index 79de8ca..35e1c36 100644 --- 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 index 0a4dad1..8c7c9d4 100644 --- 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 index d28ad8f..5e4c812 100644 --- 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 index c21429d..5d9a075 100644 --- 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 index 14229a8..0012e77 100644 --- 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/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars index 8672c1c..df07ddc 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_ecc_hana_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 index c21429d..5d9a075 100644 --- 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 index 00b650e..341aa01 100644 --- 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/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars index 2b7c042..c023914 100644 --- a/sap_ecc_hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_ecc_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 index a3958c1..09407c7 100644 --- 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 index 112a9cc..e4d2830 100644 --- 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 index d479fb3..24f5fa3 100644 --- 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" diff --git a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/main.tf b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/main.tf index 8303691..cb5ba90 100644 --- a/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/main.tf +++ b/sap_ecc_ibmdb2_single_node_install/gcp_ce_vm/main.tf @@ -213,8 +213,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/ibmcloud_vs/main.tf b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/main.tf index f8403ab..728f3af 100644 --- a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/main.tf +++ b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/main.tf @@ -245,8 +245,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/ibmcloud_vs/outputs_debug.tf b/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_ecc_ibmdb2_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_ecc_ibmdb2_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_ibmdb2_single_node_install/msazure_vm/main.tf b/sap_ecc_ibmdb2_single_node_install/msazure_vm/main.tf index 4a280a4..f57afc4 100644 --- a/sap_ecc_ibmdb2_single_node_install/msazure_vm/main.tf +++ b/sap_ecc_ibmdb2_single_node_install/msazure_vm/main.tf @@ -265,8 +265,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/msazure_vm/variables.tf b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables.tf index b2438a9..3b1c85d 100644 --- a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables.tf +++ b/sap_ecc_ibmdb2_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_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 01b7b73..17f7420 100644 --- a/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_ibmdb2_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations sap_anydb_install_sid = "DB2" diff --git a/sap_ecc_ibmdb2_single_node_install/vmware_vm/main.tf b/sap_ecc_ibmdb2_single_node_install/vmware_vm/main.tf index d312746..c09e91c 100644 --- a/sap_ecc_ibmdb2_single_node_install/vmware_vm/main.tf +++ b/sap_ecc_ibmdb2_single_node_install/vmware_vm/main.tf @@ -135,8 +135,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_oracledb_single_node_install/aws_ec2_instance/main.tf b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/main.tf index 1f608c4..f0d89f1 100644 --- a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/main.tf +++ b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/main.tf @@ -227,8 +227,6 @@ module "run_ansible_sap_ecc_oracledb_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_oracledb_single_node_install/aws_ec2_instance/variables.tf b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables.tf index e3c7d71..11cbbc7 100644 --- a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_ecc_oracledb_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_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 042eb13..adb3f26 100644 --- a/sap_ecc_oracledb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_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" sap_anydb_install_sid = "OR1" diff --git a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/main.tf b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/main.tf index 6f4be21..c3da9b9 100644 --- a/sap_ecc_oracledb_single_node_install/gcp_ce_vm/main.tf +++ b/sap_ecc_oracledb_single_node_install/gcp_ce_vm/main.tf @@ -213,8 +213,6 @@ module "run_ansible_sap_ecc_oracledb_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_oracledb_single_node_install/ibmcloud_vs/main.tf b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/main.tf index a3805cd..fee28ab 100644 --- a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/main.tf +++ b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/main.tf @@ -245,8 +245,6 @@ module "run_ansible_sap_ecc_oracledb_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_oracledb_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_ecc_oracledb_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_ecc_oracledb_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_ecc_oracledb_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_oracledb_single_node_install/msazure_vm/main.tf b/sap_ecc_oracledb_single_node_install/msazure_vm/main.tf index 7708f42..c4cf03d 100644 --- a/sap_ecc_oracledb_single_node_install/msazure_vm/main.tf +++ b/sap_ecc_oracledb_single_node_install/msazure_vm/main.tf @@ -265,8 +265,6 @@ module "run_ansible_sap_ecc_oracledb_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_oracledb_single_node_install/msazure_vm/variables.tf b/sap_ecc_oracledb_single_node_install/msazure_vm/variables.tf index bb966bd..69efbf8 100644 --- a/sap_ecc_oracledb_single_node_install/msazure_vm/variables.tf +++ b/sap_ecc_oracledb_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_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 7eb8e63..547c3fc 100644 --- a/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_oracledb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass#321" sap_anydb_install_sid = "OR1" diff --git a/sap_ecc_oracledb_single_node_install/vmware_vm/main.tf b/sap_ecc_oracledb_single_node_install/vmware_vm/main.tf index 2b26e3e..259256e 100644 --- a/sap_ecc_oracledb_single_node_install/vmware_vm/main.tf +++ b/sap_ecc_oracledb_single_node_install/vmware_vm/main.tf @@ -135,8 +135,6 @@ module "run_ansible_sap_ecc_oracledb_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_sapase_single_node_install/aws_ec2_instance/main.tf b/sap_ecc_sapase_single_node_install/aws_ec2_instance/main.tf index 3b56bb0..12f5649 100644 --- a/sap_ecc_sapase_single_node_install/aws_ec2_instance/main.tf +++ b/sap_ecc_sapase_single_node_install/aws_ec2_instance/main.tf @@ -227,8 +227,6 @@ module "run_ansible_sap_ecc_sapase_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_sapase_single_node_install/aws_ec2_instance/variables.tf b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables.tf index 8fd5343..c75e76f 100644 --- a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_ecc_sapase_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_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index d35744b..1362651 100644 --- a/sap_ecc_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_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" sap_anydb_install_sid = "MX1" diff --git a/sap_ecc_sapase_single_node_install/gcp_ce_vm/main.tf b/sap_ecc_sapase_single_node_install/gcp_ce_vm/main.tf index 0daafc3..c2c3d18 100644 --- a/sap_ecc_sapase_single_node_install/gcp_ce_vm/main.tf +++ b/sap_ecc_sapase_single_node_install/gcp_ce_vm/main.tf @@ -213,8 +213,6 @@ module "run_ansible_sap_ecc_sapase_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_sapase_single_node_install/ibmcloud_vs/main.tf b/sap_ecc_sapase_single_node_install/ibmcloud_vs/main.tf index 7fba105..b1e02c5 100644 --- a/sap_ecc_sapase_single_node_install/ibmcloud_vs/main.tf +++ b/sap_ecc_sapase_single_node_install/ibmcloud_vs/main.tf @@ -245,8 +245,6 @@ module "run_ansible_sap_ecc_sapase_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_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_ecc_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_ecc_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_ecc_sapase_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_sapase_single_node_install/msazure_vm/main.tf b/sap_ecc_sapase_single_node_install/msazure_vm/main.tf index 7afcae2..eeeaa25 100644 --- a/sap_ecc_sapase_single_node_install/msazure_vm/main.tf +++ b/sap_ecc_sapase_single_node_install/msazure_vm/main.tf @@ -265,8 +265,6 @@ module "run_ansible_sap_ecc_sapase_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_sapase_single_node_install/msazure_vm/variables.tf b/sap_ecc_sapase_single_node_install/msazure_vm/variables.tf index ab087e6..f773ead 100644 --- a/sap_ecc_sapase_single_node_install/msazure_vm/variables.tf +++ b/sap_ecc_sapase_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_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 29295e4..be623a2 100644 --- a/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "AS1" diff --git a/sap_ecc_sapase_single_node_install/vmware_vm/main.tf b/sap_ecc_sapase_single_node_install/vmware_vm/main.tf index 00c708c..0b9972d 100644 --- a/sap_ecc_sapase_single_node_install/vmware_vm/main.tf +++ b/sap_ecc_sapase_single_node_install/vmware_vm/main.tf @@ -135,8 +135,6 @@ module "run_ansible_sap_ecc_sapase_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_sapmaxdb_single_node_install/aws_ec2_instance/main.tf b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/main.tf index 6c212de..2dcaab1 100644 --- a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/main.tf +++ b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/main.tf @@ -227,8 +227,6 @@ module "run_ansible_sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/aws_ec2_instance/variables.tf b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables.tf index 8fd5343..c75e76f 100644 --- a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index d35744b..1362651 100644 --- a/sap_ecc_sapmaxdb_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_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" sap_anydb_install_sid = "MX1" diff --git a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/main.tf b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/main.tf index 0b2f8b3..74d2d19 100644 --- a/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/main.tf +++ b/sap_ecc_sapmaxdb_single_node_install/gcp_ce_vm/main.tf @@ -213,8 +213,6 @@ module "run_ansible_sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/ibmcloud_vs/main.tf b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/main.tf index c4702fe..cf48d08 100644 --- a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/main.tf +++ b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/main.tf @@ -245,8 +245,6 @@ module "run_ansible_sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_ecc_sapmaxdb_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/msazure_vm/main.tf b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/main.tf index 9b4b128..b61fe10 100644 --- a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/main.tf +++ b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/main.tf @@ -265,8 +265,6 @@ module "run_ansible_sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/msazure_vm/variables.tf b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables.tf index fd533cc..2ad68c9 100644 --- a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables.tf +++ b/sap_ecc_sapmaxdb_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_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 3bd7663..358ca0c 100644 --- a/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_ecc_sapmaxdb_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "MX1" diff --git a/sap_ecc_sapmaxdb_single_node_install/vmware_vm/main.tf b/sap_ecc_sapmaxdb_single_node_install/vmware_vm/main.tf index 874f5e4..4a42d43 100644 --- a/sap_ecc_sapmaxdb_single_node_install/vmware_vm/main.tf +++ b/sap_ecc_sapmaxdb_single_node_install/vmware_vm/main.tf @@ -135,8 +135,6 @@ module "run_ansible_sap_ecc_sapase_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_hana_single_node_install/aws_ec2_instance/variables.tf b/sap_hana_single_node_install/aws_ec2_instance/variables.tf index caf3a56..1548488 100644 --- a/sap_hana_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_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_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index bea059e..1f885c4 100644 --- a/sap_hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_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 = 304 - -disk_volume_type_software = "gp3" - sap_hana_install_master_password = "NewPass$321" sap_hana_install_sid = "H01" diff --git a/sap_hana_single_node_install/ibmcloud_powervs/outputs_debug.tf b/sap_hana_single_node_install/ibmcloud_powervs/outputs_debug.tf index d6970cd..17797ae 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/outputs_debug.tf +++ b/sap_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_hana_single_node_install/ibmcloud_powervs/variables.tf b/sap_hana_single_node_install/ibmcloud_powervs/variables.tf index 2119a90..1e105dd 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variables.tf +++ b/sap_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_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index f7d81de..6f7da32 100644 --- a/sap_hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_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 = 304 - -disk_volume_type_software = "tier1" - sap_hana_install_master_password = "NewPass$321" sap_hana_install_sid = "H01" diff --git a/sap_hana_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_hana_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_hana_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_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_hana_single_node_install/ibmcloud_vs/variables.tf b/sap_hana_single_node_install/ibmcloud_vs/variables.tf index 703f39c..3367eb1 100644 --- a/sap_hana_single_node_install/ibmcloud_vs/variables.tf +++ b/sap_hana_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_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 826a0f4..d0d2ac9 100644 --- a/sap_hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_hana_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_hana_single_node_install/ibmpowervc/variables.tf b/sap_hana_single_node_install/ibmpowervc/variables.tf index 93ecef0..018c00a 100644 --- a/sap_hana_single_node_install/ibmpowervc/variables.tf +++ b/sap_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_hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars index 07f844e..610a4cc 100644 --- a/sap_hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars +++ b/sap_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 = 304 - sap_hana_install_master_password = "NewPass$321" sap_hana_install_sid = "H01" diff --git a/sap_hana_single_node_install/msazure_vm/variables.tf b/sap_hana_single_node_install/msazure_vm/variables.tf index 529b42c..f8df425 100644 --- a/sap_hana_single_node_install/msazure_vm/variables.tf +++ b/sap_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_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 480f187..44c246d 100644 --- a/sap_hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_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 = 304 - sap_hana_install_master_password = "NewPass$321" sap_hana_install_sid = "H01" diff --git a/sap_nwas_abap_hana_install/aws_ec2_instance/variables.tf b/sap_nwas_abap_hana_install/aws_ec2_instance/variables.tf index 96d2b24..fc61c4c 100644 --- a/sap_nwas_abap_hana_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 6d45227..7f1725a 100644 --- a/sap_nwas_abap_hana_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmcloud_powervs/outputs_debug.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/outputs_debug.tf index d6970cd..17797ae 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/outputs_debug.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmcloud_powervs/variables.tf b/sap_nwas_abap_hana_install/ibmcloud_powervs/variables.tf index 84b7c8a..2825d8f 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variables.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index b3cc066..fe0bd64 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_abap_hana_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_abap_hana_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmpowervc/variables.tf b/sap_nwas_abap_hana_install/ibmpowervc/variables.tf index f074086..0061018 100644 --- a/sap_nwas_abap_hana_install/ibmpowervc/variables.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/ibmpowervc/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/ibmpowervc/variables_generic_for_cli.tfvars index 02c29b7..6c766f5 100644 --- a/sap_nwas_abap_hana_install/ibmpowervc/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/msazure_vm/variables.tf b/sap_nwas_abap_hana_install/msazure_vm/variables.tf index 77d2f47..60b8848 100644 --- a/sap_nwas_abap_hana_install/msazure_vm/variables.tf +++ b/sap_nwas_abap_hana_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_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars index 5629fb9..d83d4c9 100644 --- a/sap_nwas_abap_hana_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_hana_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_nwas_abap_ibmdb2_install/aws_ec2_instance/main.tf b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/main.tf index ee506b7..298626a 100644 --- a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/main.tf +++ b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/main.tf @@ -228,8 +228,6 @@ module "run_ansible_sap_nwas_abap_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_nwas_abap_ibmdb2_install/aws_ec2_instance/variables.tf b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables.tf index be7a14e..42c84dc 100644 --- a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_abap_ibmdb2_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_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars index e0873f2..f6ffa43 100644 --- a/sap_nwas_abap_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_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" diff --git a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/main.tf b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/main.tf index 600973e..0353ff3 100644 --- a/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/main.tf +++ b/sap_nwas_abap_ibmdb2_install/gcp_ce_vm/main.tf @@ -214,8 +214,6 @@ module "run_ansible_sap_nwas_abap_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_nwas_abap_ibmdb2_install/ibmcloud_vs/main.tf b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/main.tf index aa76f02..0821441 100644 --- a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/main.tf +++ b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/main.tf @@ -246,8 +246,6 @@ module "run_ansible_sap_nwas_abap_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_nwas_abap_ibmdb2_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_abap_ibmdb2_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_abap_ibmdb2_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_nwas_abap_ibmdb2_install/msazure_vm/main.tf b/sap_nwas_abap_ibmdb2_install/msazure_vm/main.tf index 9a02a53..e954cec 100644 --- a/sap_nwas_abap_ibmdb2_install/msazure_vm/main.tf +++ b/sap_nwas_abap_ibmdb2_install/msazure_vm/main.tf @@ -266,8 +266,6 @@ module "run_ansible_sap_nwas_abap_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_nwas_abap_ibmdb2_install/msazure_vm/variables.tf b/sap_nwas_abap_ibmdb2_install/msazure_vm/variables.tf index 5b552a3..41ff7f3 100644 --- a/sap_nwas_abap_ibmdb2_install/msazure_vm/variables.tf +++ b/sap_nwas_abap_ibmdb2_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_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars index ea74158..384ed4f 100644 --- a/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass>321" // Do not use password with $ for IBM DB2 installations sap_anydb_install_sid = "DB2" diff --git a/sap_nwas_abap_ibmdb2_install/vmware_vm/main.tf b/sap_nwas_abap_ibmdb2_install/vmware_vm/main.tf index 336bab0..6061299 100644 --- a/sap_nwas_abap_ibmdb2_install/vmware_vm/main.tf +++ b/sap_nwas_abap_ibmdb2_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_abap_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_nwas_abap_oracledb_install/aws_ec2_instance/main.tf b/sap_nwas_abap_oracledb_install/aws_ec2_instance/main.tf index 54748b1..c64bb5a 100644 --- a/sap_nwas_abap_oracledb_install/aws_ec2_instance/main.tf +++ b/sap_nwas_abap_oracledb_install/aws_ec2_instance/main.tf @@ -228,8 +228,6 @@ module "run_ansible_sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/aws_ec2_instance/variables.tf b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables.tf index c89a293..b108be7 100644 --- a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 1c6d9c3..a20bd24 100644 --- a/sap_nwas_abap_oracledb_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_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" sap_anydb_install_sid = "OR1" diff --git a/sap_nwas_abap_oracledb_install/gcp_ce_vm/main.tf b/sap_nwas_abap_oracledb_install/gcp_ce_vm/main.tf index a55ea1b..e27d7e1 100644 --- a/sap_nwas_abap_oracledb_install/gcp_ce_vm/main.tf +++ b/sap_nwas_abap_oracledb_install/gcp_ce_vm/main.tf @@ -214,8 +214,6 @@ module "run_ansible_sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/ibmcloud_vs/main.tf b/sap_nwas_abap_oracledb_install/ibmcloud_vs/main.tf index 93ae0a5..dade5cf 100644 --- a/sap_nwas_abap_oracledb_install/ibmcloud_vs/main.tf +++ b/sap_nwas_abap_oracledb_install/ibmcloud_vs/main.tf @@ -246,8 +246,6 @@ module "run_ansible_sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_abap_oracledb_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_abap_oracledb_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/msazure_vm/main.tf b/sap_nwas_abap_oracledb_install/msazure_vm/main.tf index 29d22de..63e1be2 100644 --- a/sap_nwas_abap_oracledb_install/msazure_vm/main.tf +++ b/sap_nwas_abap_oracledb_install/msazure_vm/main.tf @@ -266,8 +266,6 @@ module "run_ansible_sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/msazure_vm/variables.tf b/sap_nwas_abap_oracledb_install/msazure_vm/variables.tf index 68a73bb..529dcaf 100644 --- a/sap_nwas_abap_oracledb_install/msazure_vm/variables.tf +++ b/sap_nwas_abap_oracledb_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_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars index 9c309ad..33fe7a9 100644 --- a/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_oracledb_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass#321" sap_anydb_install_sid = "OR1" diff --git a/sap_nwas_abap_oracledb_install/vmware_vm/main.tf b/sap_nwas_abap_oracledb_install/vmware_vm/main.tf index 95aff74..000c5fe 100644 --- a/sap_nwas_abap_oracledb_install/vmware_vm/main.tf +++ b/sap_nwas_abap_oracledb_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_abap_oracledb_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_nwas_abap_sapase_install/aws_ec2_instance/main.tf b/sap_nwas_abap_sapase_install/aws_ec2_instance/main.tf index aa964ac..38d2e37 100644 --- a/sap_nwas_abap_sapase_install/aws_ec2_instance/main.tf +++ b/sap_nwas_abap_sapase_install/aws_ec2_instance/main.tf @@ -228,8 +228,6 @@ module "run_ansible_sap_nwas_abap_sapase_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_nwas_abap_sapase_install/aws_ec2_instance/variables.tf b/sap_nwas_abap_sapase_install/aws_ec2_instance/variables.tf index be7a14e..42c84dc 100644 --- a/sap_nwas_abap_sapase_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_abap_sapase_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_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 93de5db..6cc7ecd 100644 --- a/sap_nwas_abap_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_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" sap_anydb_install_sid = "AS1" diff --git a/sap_nwas_abap_sapase_install/gcp_ce_vm/main.tf b/sap_nwas_abap_sapase_install/gcp_ce_vm/main.tf index 5a38463..9d0c7ec 100644 --- a/sap_nwas_abap_sapase_install/gcp_ce_vm/main.tf +++ b/sap_nwas_abap_sapase_install/gcp_ce_vm/main.tf @@ -214,8 +214,6 @@ module "run_ansible_sap_nwas_abap_sapase_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_nwas_abap_sapase_install/ibmcloud_vs/main.tf b/sap_nwas_abap_sapase_install/ibmcloud_vs/main.tf index 0c8b1eb..0de5ff1 100644 --- a/sap_nwas_abap_sapase_install/ibmcloud_vs/main.tf +++ b/sap_nwas_abap_sapase_install/ibmcloud_vs/main.tf @@ -246,8 +246,6 @@ module "run_ansible_sap_nwas_abap_sapase_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_nwas_abap_sapase_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_abap_sapase_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_abap_sapase_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_abap_sapase_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_nwas_abap_sapase_install/msazure_vm/main.tf b/sap_nwas_abap_sapase_install/msazure_vm/main.tf index 2f2263e..bbb51ba 100644 --- a/sap_nwas_abap_sapase_install/msazure_vm/main.tf +++ b/sap_nwas_abap_sapase_install/msazure_vm/main.tf @@ -266,8 +266,6 @@ module "run_ansible_sap_nwas_abap_sapase_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_nwas_abap_sapase_install/msazure_vm/variables.tf b/sap_nwas_abap_sapase_install/msazure_vm/variables.tf index e29fab8..1a3c61d 100644 --- a/sap_nwas_abap_sapase_install/msazure_vm/variables.tf +++ b/sap_nwas_abap_sapase_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_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars index e4b6b07..ffa5ee8 100644 --- a/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapase_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "AS1" diff --git a/sap_nwas_abap_sapase_install/vmware_vm/main.tf b/sap_nwas_abap_sapase_install/vmware_vm/main.tf index 3d5ac2d..99c0b43 100644 --- a/sap_nwas_abap_sapase_install/vmware_vm/main.tf +++ b/sap_nwas_abap_sapase_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_abap_sapase_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_nwas_abap_sapmaxdb_install/aws_ec2_instance/main.tf b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/main.tf index 4b27f53..d03963d 100644 --- a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/main.tf +++ b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/main.tf @@ -228,8 +228,6 @@ module "run_ansible_sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables.tf b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables.tf index 21c8e6f..73e098e 100644 --- a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars index b791eec..39fde33 100644 --- a/sap_nwas_abap_sapmaxdb_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_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" sap_anydb_install_sid = "MX1" diff --git a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/main.tf b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/main.tf index f6d8979..5477e98 100644 --- a/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/main.tf +++ b/sap_nwas_abap_sapmaxdb_install/gcp_ce_vm/main.tf @@ -214,8 +214,6 @@ module "run_ansible_sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/ibmcloud_vs/main.tf b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/main.tf index 8bd45b1..881a9bc 100644 --- a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/main.tf +++ b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/main.tf @@ -246,8 +246,6 @@ module "run_ansible_sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_abap_sapmaxdb_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/msazure_vm/main.tf b/sap_nwas_abap_sapmaxdb_install/msazure_vm/main.tf index 1a1419b..003f899 100644 --- a/sap_nwas_abap_sapmaxdb_install/msazure_vm/main.tf +++ b/sap_nwas_abap_sapmaxdb_install/msazure_vm/main.tf @@ -266,8 +266,6 @@ module "run_ansible_sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/msazure_vm/variables.tf b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables.tf index bce577c..8db6535 100644 --- a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables.tf +++ b/sap_nwas_abap_sapmaxdb_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_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars index d7ade61..b050463 100644 --- a/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_abap_sapmaxdb_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "MX1" diff --git a/sap_nwas_abap_sapmaxdb_install/vmware_vm/main.tf b/sap_nwas_abap_sapmaxdb_install/vmware_vm/main.tf index 74504d9..f3bded9 100644 --- a/sap_nwas_abap_sapmaxdb_install/vmware_vm/main.tf +++ b/sap_nwas_abap_sapmaxdb_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_abap_sapmaxdb_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_nwas_java_ibmdb2_install/aws_ec2_instance/main.tf b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/main.tf index 6e520d7..15e832a 100644 --- a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/main.tf +++ b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/main.tf @@ -230,8 +230,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_ibmdb2_install/aws_ec2_instance/variables.tf b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables.tf index 62dc500..a3c56d4 100644 --- a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_java_ibmdb2_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_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 48ebd05..c699cea 100644 --- a/sap_nwas_java_ibmdb2_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_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" sap_anydb_install_sid = "DB2" diff --git a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/main.tf b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/main.tf index 145660f..822d21a 100644 --- a/sap_nwas_java_ibmdb2_install/gcp_ce_vm/main.tf +++ b/sap_nwas_java_ibmdb2_install/gcp_ce_vm/main.tf @@ -216,8 +216,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_ibmdb2_install/ibmcloud_vs/main.tf b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/main.tf index 8577cf0..b4d52da 100644 --- a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/main.tf +++ b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/main.tf @@ -248,8 +248,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_ibmdb2_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_java_ibmdb2_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_java_ibmdb2_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_java_ibmdb2_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_nwas_java_ibmdb2_install/msazure_vm/main.tf b/sap_nwas_java_ibmdb2_install/msazure_vm/main.tf index 0fe3b24..24508c2 100644 --- a/sap_nwas_java_ibmdb2_install/msazure_vm/main.tf +++ b/sap_nwas_java_ibmdb2_install/msazure_vm/main.tf @@ -268,8 +268,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_ibmdb2_install/msazure_vm/variables.tf b/sap_nwas_java_ibmdb2_install/msazure_vm/variables.tf index 54ae05b..d551179 100644 --- a/sap_nwas_java_ibmdb2_install/msazure_vm/variables.tf +++ b/sap_nwas_java_ibmdb2_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_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars index 7553743..d5dfd8f 100644 --- a/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_ibmdb2_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "DB2" diff --git a/sap_nwas_java_ibmdb2_install/vmware_vm/main.tf b/sap_nwas_java_ibmdb2_install/vmware_vm/main.tf index d65a10f..3f5d2f4 100644 --- a/sap_nwas_java_ibmdb2_install/vmware_vm/main.tf +++ b/sap_nwas_java_ibmdb2_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_sapase_install/aws_ec2_instance/main.tf b/sap_nwas_java_sapase_install/aws_ec2_instance/main.tf index cb20747..918fc78 100644 --- a/sap_nwas_java_sapase_install/aws_ec2_instance/main.tf +++ b/sap_nwas_java_sapase_install/aws_ec2_instance/main.tf @@ -230,8 +230,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_sapase_install/aws_ec2_instance/variables.tf b/sap_nwas_java_sapase_install/aws_ec2_instance/variables.tf index 4f7d5db..5895480 100644 --- a/sap_nwas_java_sapase_install/aws_ec2_instance/variables.tf +++ b/sap_nwas_java_sapase_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_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars index baa7cff..8f2516e 100644 --- a/sap_nwas_java_sapase_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_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" sap_anydb_install_sid = "AS1" diff --git a/sap_nwas_java_sapase_install/gcp_ce_vm/main.tf b/sap_nwas_java_sapase_install/gcp_ce_vm/main.tf index 9bb617f..3c327dc 100644 --- a/sap_nwas_java_sapase_install/gcp_ce_vm/main.tf +++ b/sap_nwas_java_sapase_install/gcp_ce_vm/main.tf @@ -216,8 +216,6 @@ module "run_ansible_sap_nwas_java_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_nwas_java_sapase_install/ibmcloud_vs/main.tf b/sap_nwas_java_sapase_install/ibmcloud_vs/main.tf index bb8f134..2e226f2 100644 --- a/sap_nwas_java_sapase_install/ibmcloud_vs/main.tf +++ b/sap_nwas_java_sapase_install/ibmcloud_vs/main.tf @@ -248,8 +248,6 @@ module "run_ansible_sap_nwas_java_sapase_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_nwas_java_sapase_install/ibmcloud_vs/outputs_debug.tf b/sap_nwas_java_sapase_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_nwas_java_sapase_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_nwas_java_sapase_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_nwas_java_sapase_install/msazure_vm/main.tf b/sap_nwas_java_sapase_install/msazure_vm/main.tf index e17f597..32b772c 100644 --- a/sap_nwas_java_sapase_install/msazure_vm/main.tf +++ b/sap_nwas_java_sapase_install/msazure_vm/main.tf @@ -268,8 +268,6 @@ module "run_ansible_sap_nwas_java_sapase_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_nwas_java_sapase_install/msazure_vm/variables.tf b/sap_nwas_java_sapase_install/msazure_vm/variables.tf index ea80a7e..0f6c920 100644 --- a/sap_nwas_java_sapase_install/msazure_vm/variables.tf +++ b/sap_nwas_java_sapase_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_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars index de6c0b9..bd6ff84 100644 --- a/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_nwas_java_sapase_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "AS1" diff --git a/sap_nwas_java_sapase_install/vmware_vm/main.tf b/sap_nwas_java_sapase_install/vmware_vm/main.tf index 295dd6d..6f0aedf 100644 --- a/sap_nwas_java_sapase_install/vmware_vm/main.tf +++ b/sap_nwas_java_sapase_install/vmware_vm/main.tf @@ -136,8 +136,6 @@ module "run_ansible_sap_nwas_java_sapase_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_s4hana_single_node_install/aws_ec2_instance/variables.tf b/sap_s4hana_single_node_install/aws_ec2_instance/variables.tf index 6893e1e..bd370a2 100644 --- a/sap_s4hana_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_s4hana_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_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 19c9ce2..734cc8b 100644 --- a/sap_s4hana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_powervs/outputs_debug.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/outputs_debug.tf index d6970cd..17797ae 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/outputs_debug.tf +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_powervs/variables.tf b/sap_s4hana_single_node_install/ibmcloud_powervs/variables.tf index 20b1632..d40ed7b 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variables.tf +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars index 5089bde..b3ec91a 100644 --- a/sap_s4hana_single_node_install/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_s4hana_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_s4hana_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_vs/variables.tf b/sap_s4hana_single_node_install/ibmcloud_vs/variables.tf index 1fc08b6..90ae18b 100644 --- a/sap_s4hana_single_node_install/ibmcloud_vs/variables.tf +++ b/sap_s4hana_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_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index e3de805..14d95cc 100644 --- a/sap_s4hana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_install/ibmpowervc/variables.tf b/sap_s4hana_single_node_install/ibmpowervc/variables.tf index f505c07..399d3f6 100644 --- a/sap_s4hana_single_node_install/ibmpowervc/variables.tf +++ b/sap_s4hana_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_s4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars index 2be6518..157dd56 100644 --- a/sap_s4hana_single_node_install/ibmpowervc/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_install/msazure_vm/variables.tf b/sap_s4hana_single_node_install/msazure_vm/variables.tf index 3d17481..1384167 100644 --- a/sap_s4hana_single_node_install/msazure_vm/variables.tf +++ b/sap_s4hana_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_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 5629fb9..d83d4c9 100644 --- a/sap_s4hana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables.tf b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables.tf index 1f8b601..a82e1f8 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars index 19c9ce2..734cc8b 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/outputs_debug.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/outputs_debug.tf index d6970cd..17797ae 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/outputs_debug.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables.tf index 06739d1..e6c89d8 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars index 5089bde..b3ec91a 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/outputs_debug.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/outputs_debug.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables.tf index 0cc45fb..e7c0691 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars index a79db22..f17cfc5 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables.tf b/sap_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables.tf index ee95ca4..bc03547 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables_generic_for_cli.tfvars index 2be6518..157dd56 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/ibmpowervc/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/msazure_vm/variables.tf b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables.tf index 3d17481..1384167 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables.tf +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars index 5629fb9..d83d4c9 100644 --- a/sap_s4hana_single_node_install_maintenance_plan/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_s4hana_single_node_install_maintenance_plan/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_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/outputs_debug.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/outputs_debug.tf index d6970cd..17797ae 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/outputs_debug.tf +++ b/sap_s4hana_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_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables.tf index 2f6f233..90a6b72 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables.tf +++ b/sap_s4hana_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/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars index 562bdf5..469ef8a 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_powervs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/outputs_debug.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/outputs_debug.tf +++ b/sap_s4hana_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_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables.tf b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables.tf index 844ea2c..c77b453 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables.tf +++ b/sap_s4hana_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/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars index 5142b1e..14d95cc 100644 --- a/sap_s4hana_single_node_system_copy_homogeneous_hdb/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_s4hana_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_solman_sapase_single_node_install/aws_ec2_instance/main.tf b/sap_solman_sapase_single_node_install/aws_ec2_instance/main.tf index eb424b1..08c5ff3 100644 --- a/sap_solman_sapase_single_node_install/aws_ec2_instance/main.tf +++ b/sap_solman_sapase_single_node_install/aws_ec2_instance/main.tf @@ -232,8 +232,6 @@ module "run_ansible_sap_solman_java_sapase_install" { module_var_sap_swpm_template_selected = "sap_solman_72_sr2_sapase_onehost" - 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_solman_sapase_single_node_install/aws_ec2_instance/variables.tf b/sap_solman_sapase_single_node_install/aws_ec2_instance/variables.tf index 858676b..c28c767 100644 --- a/sap_solman_sapase_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_solman_sapase_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_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index cb3d9a8..bcd5078 100644 --- a/sap_solman_sapase_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_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" sap_anydb_install_sid = "AS1" diff --git a/sap_solman_sapase_single_node_install/gcp_ce_vm/main.tf b/sap_solman_sapase_single_node_install/gcp_ce_vm/main.tf index aa38664..40dd44c 100644 --- a/sap_solman_sapase_single_node_install/gcp_ce_vm/main.tf +++ b/sap_solman_sapase_single_node_install/gcp_ce_vm/main.tf @@ -219,8 +219,6 @@ module "run_ansible_sap_solman_java_sapase_install" { module_var_sap_swpm_template_selected = "sap_solman_72_sr2_sapase_onehost" - 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_solman_sapase_single_node_install/ibmcloud_vs/main.tf b/sap_solman_sapase_single_node_install/ibmcloud_vs/main.tf index d37ef5c..2ac8179 100644 --- a/sap_solman_sapase_single_node_install/ibmcloud_vs/main.tf +++ b/sap_solman_sapase_single_node_install/ibmcloud_vs/main.tf @@ -256,8 +256,6 @@ module "run_ansible_sap_solman_java_sapase_install" { module_var_sap_swpm_template_selected = "sap_solman_72_sr2_sapase_onehost" - 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_solman_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_solman_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_solman_sapase_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_solman_sapase_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_solman_sapase_single_node_install/msazure_vm/main.tf b/sap_solman_sapase_single_node_install/msazure_vm/main.tf index 8b54f24..28360fb 100644 --- a/sap_solman_sapase_single_node_install/msazure_vm/main.tf +++ b/sap_solman_sapase_single_node_install/msazure_vm/main.tf @@ -270,8 +270,6 @@ module "run_ansible_sap_solman_java_sapase_install" { module_var_sap_swpm_template_selected = "sap_solman_72_sr2_sapase_onehost" - 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_solman_sapase_single_node_install/msazure_vm/variables.tf b/sap_solman_sapase_single_node_install/msazure_vm/variables.tf index 432b7a9..65a9627 100644 --- a/sap_solman_sapase_single_node_install/msazure_vm/variables.tf +++ b/sap_solman_sapase_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_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index b2fbb86..1afd3c6 100644 --- a/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_sapase_single_node_install/msazure_vm/variables_generic_for_cli.tfvars @@ -12,8 +12,6 @@ host_specification_plan = "small_32vcpu" host_os_image = "rhel-8-4-sap-ha" -disk_volume_capacity_software = 304 - sap_anydb_install_master_password = "NewPass@321" sap_anydb_install_sid = "AS1" diff --git a/sap_solman_saphana_single_node_install/aws_ec2_instance/variables.tf b/sap_solman_saphana_single_node_install/aws_ec2_instance/variables.tf index 8536c21..c978e06 100644 --- a/sap_solman_saphana_single_node_install/aws_ec2_instance/variables.tf +++ b/sap_solman_saphana_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_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars index 6d45227..7f1725a 100644 --- a/sap_solman_saphana_single_node_install/aws_ec2_instance/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_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_solman_saphana_single_node_install/ibmcloud_vs/outputs_debug.tf b/sap_solman_saphana_single_node_install/ibmcloud_vs/outputs_debug.tf index c21429d..5d9a075 100644 --- a/sap_solman_saphana_single_node_install/ibmcloud_vs/outputs_debug.tf +++ b/sap_solman_saphana_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_solman_saphana_single_node_install/ibmcloud_vs/variables.tf b/sap_solman_saphana_single_node_install/ibmcloud_vs/variables.tf index 922e24e..f041699 100644 --- a/sap_solman_saphana_single_node_install/ibmcloud_vs/variables.tf +++ b/sap_solman_saphana_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_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars index 80c8f09..8a7f133 100644 --- a/sap_solman_saphana_single_node_install/ibmcloud_vs/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_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_nwas_abap_ascs_instance_no = "01" sap_nwas_abap_pas_instance_no = "00" diff --git a/sap_solman_saphana_single_node_install/msazure_vm/variables.tf b/sap_solman_saphana_single_node_install/msazure_vm/variables.tf index d1fa96f..14cfcfa 100644 --- a/sap_solman_saphana_single_node_install/msazure_vm/variables.tf +++ b/sap_solman_saphana_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_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars b/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars index 5629fb9..d83d4c9 100644 --- a/sap_solman_saphana_single_node_install/msazure_vm/variables_generic_for_cli.tfvars +++ b/sap_solman_saphana_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"