Remove quotes to variable types (now deprecated)

SUSE · Nov 25, 2019 · 8fa05c3 · 8fa05c3
1 parent 696c352
commit 8fa05c3
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 21 deletions.
diff --git a/aws/create_remote_state/vars.tf b/aws/create_remote_state/vars.tf
@@ -1,5 +1,5 @@
 variable "aws_region" {
-  type    = "string"
+  type    = string
   default = "eu-central-1"
 }
 

diff --git a/aws/variables.tf b/aws/variables.tf
@@ -162,7 +162,7 @@ variable "host_ips" {
 # Contains the salt formulas rpm packages.
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
 variable "scenario_type" {

diff --git a/azure/modules/drbd_node/salt_provisioner.tf b/azure/modules/drbd_node/salt_provisioner.tf
@@ -54,7 +54,6 @@ ha_sap_deployment_repo: ${var.ha_sap_deployment_repo}
 monitoring_enabled: ${var.monitoring_enabled}
 devel_mode: ${var.devel_mode}
 qa_mode: ${var.qa_mode}
-drbd_nodes: ${var.drbd_count}
 partitions:
   1:
     start: 0%

diff --git a/libvirt/modules/drbd_node/salt_provisioner.tf b/libvirt/modules/drbd_node/salt_provisioner.tf
@@ -55,7 +55,6 @@ sbd_disk_device: "${var.shared_storage_type == "iscsi" ? "/dev/sda" : "/dev/vdc"
 iscsi_srv_ip: ${var.iscsi_srv_ip}
 ha_sap_deployment_repo: ${var.ha_sap_deployment_repo}
 monitoring_enabled: ${var.monitoring_enabled}
-drbd_nodes: ${var.drbd_count}
 partitions:
   1:
     start: 0%

diff --git a/libvirt/modules/drbd_node/variables.tf b/libvirt/modules/drbd_node/variables.tf
@@ -28,7 +28,7 @@ variable "reg_additional_modules" {
 // hana/drbd
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
 variable "devel_mode" {
@@ -136,7 +136,7 @@ variable "monitoring_enabled" {
 // sbd disks
 variable "sbd_disk_id" {
   description = "SBD disk volume id"
-  type        = "string"
+  type        = string
 }
 
 variable "pool" {

diff --git a/libvirt/modules/hana_node/variables.tf b/libvirt/modules/hana_node/variables.tf
@@ -28,7 +28,7 @@ variable "reg_additional_modules" {
 // hana
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
 variable "devel_mode" {
@@ -81,7 +81,7 @@ variable "shared_storage_type" {
 
 variable "sbd_disk_id" {
   description = "SBD disk volume id"
-  type        = "string"
+  type        = string
 }
 
 variable "iscsi_srv_ip" {

diff --git a/libvirt/modules/iscsi_server/variables.tf b/libvirt/modules/iscsi_server/variables.tf
@@ -1,21 +1,21 @@
 variable "iscsi_image" {
   description = "iscsi server base image"
-  type        = "string"
+  type        = string
 }
 
 variable "iscsi_srv_ip" {
   description = "iscsi server address"
-  type        = "string"
+  type        = string
 }
 
 variable "iscsidev" {
   description = "device iscsi for iscsi server"
-  type        = "string"
+  type        = string
 }
 
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
 variable "reg_code" {
@@ -30,7 +30,7 @@ variable "reg_email" {
 
 variable "reg_additional_modules" {
   description = "Map of the modules to be registered. Module name = Regcode, when needed."
-  type        = "map"
+  type        = map
   default     = {}
 }
 

diff --git a/libvirt/modules/monitoring/variables.tf b/libvirt/modules/monitoring/variables.tf
@@ -1,6 +1,6 @@
 variable "monitoring_image" {
   description = "monitoring server base image"
-  type        = "string"
+  type        = string
   default     = ""
 }
 
@@ -63,7 +63,7 @@ variable "additional_packages" {
 
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
 variable "public_key_location" {

diff --git a/libvirt/modules/netweaver_node/variables.tf b/libvirt/modules/netweaver_node/variables.tf
@@ -27,10 +27,9 @@ variable "reg_additional_modules" {
 
 variable "ha_sap_deployment_repo" {
   description = "Repository url used to install HA/SAP deployment packages"
-  type        = "string"
+  type        = string
 }
 
-
 variable "additional_packages" {
   description = "extra packages which should be installed"
   default     = []
@@ -53,7 +52,7 @@ variable "host_ips" {
 
 variable "shared_disk_id" {
   description = "ASCS and ERS shared disk volume id"
-  type        = "string"
+  type        = string
 }
 
 variable "netweaver_inst_media" {

diff --git a/libvirt/modules/shared_disk/main.tf b/libvirt/modules/shared_disk/main.tf
@@ -5,10 +5,10 @@ resource "libvirt_volume" "shared_disk" {
   count = var.shared_disk_count
 
   xml {
-    xslt = "${file("modules/shared_disk/raw.xsl")}"
+    xslt = file("modules/shared_disk/raw.xsl")
   }
 }
 
 output "id" {
-  value = "${join(",", libvirt_volume.shared_disk.*.id)}"
+  value = join(",", libvirt_volume.shared_disk.*.id)
 }
diff --git a/libvirt/modules/shared_disk/variables.tf b/libvirt/modules/shared_disk/variables.tf
@@ -1,6 +1,6 @@
 variable "name" {
   description = "name of the disk"
-  type        = "string"
+  type        = string
 }
 
 variable "pool" {