Skip to content

Commit 22324a9

Browse files
mpagotmpagot
authored
Terraform azurerm migration to 4 (#424)
Fix some terraform warnings. Add a note about the SubscriptionID.
1 parent 7a21c70 commit 22324a9

File tree

5 files changed

+24
-17
lines changed

5 files changed

+24
-17
lines changed

‎terraform/azure/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ For detailed information and deployment options have a look at `terraform.tfvars
6262
az account set --subscription "SUSE R&D General"
6363
```
6464

65+
**Note:** With versions 4 of the 'azurerm' Terraform provider, it is now mandatory to specify the subscription ID.
66+
If you are authenticating using the Azure CLI interactively, you must export the `ARM_SUBSCRIPTION_ID` environment variable. You can do this with the following command:
67+
68+
``` shell
69+
export ARM_SUBSCRIPTION_ID=00000000-xxxx-xxxx-xxxx-xxxxxxxxxxxx
70+
```
71+
6572
You should be able to deploy now.
6673

6774
To verify which subscription is the active one, use the command `az account show`.

‎terraform/azure/modules/drbd_node/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resource "azurerm_lb_probe" "drbd-health-probe" {
7777
# backend_address_pool_id = azurerm_lb_backend_address_pool.drbd-backend-pool[0].id
7878
# probe_id = azurerm_lb_probe.drbd-health-probe.id
7979
# idle_timeout_in_minutes = 30
80-
# enable_floating_ip = "true"
80+
# floating_ip_enabled = "true"
8181
#}
8282

8383
resource "azurerm_lb_rule" "drbd-lb-tcp-2049" {
@@ -92,7 +92,7 @@ resource "azurerm_lb_rule" "drbd-lb-tcp-2049" {
9292
backend_address_pool_ids = [azurerm_lb_backend_address_pool.drbd-backend-pool[count.index].id]
9393
probe_id = azurerm_lb_probe.drbd-health-probe[count.index].id
9494
idle_timeout_in_minutes = 30
95-
enable_floating_ip = "true"
95+
floating_ip_enabled = "true"
9696
}
9797

9898
resource "azurerm_lb_rule" "drbd-lb-udp-2049" {
@@ -107,7 +107,7 @@ resource "azurerm_lb_rule" "drbd-lb-udp-2049" {
107107
backend_address_pool_ids = [azurerm_lb_backend_address_pool.drbd-backend-pool[count.index].id]
108108
probe_id = azurerm_lb_probe.drbd-health-probe[count.index].id
109109
idle_timeout_in_minutes = 30
110-
enable_floating_ip = "true"
110+
floating_ip_enabled = "true"
111111
}
112112

113113
# drbd network configuration

‎terraform/azure/modules/hana_node/main.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ resource "azurerm_lb_rule" "hana-lb-rules" {
116116
backend_address_pool_ids = [azurerm_lb_backend_address_pool.hana-load-balancer[0].id]
117117
probe_id = azurerm_lb_probe.hana-load-balancer[0].id
118118
idle_timeout_in_minutes = 30
119-
enable_floating_ip = "true"
119+
floating_ip_enabled = "true"
120120
}
121121

122122
# Load balancing rules for the Active/Active setup
@@ -132,7 +132,7 @@ resource "azurerm_lb_rule" "hana-lb-rules-secondary" {
132132
backend_address_pool_ids = [azurerm_lb_backend_address_pool.hana-load-balancer[0].id]
133133
probe_id = azurerm_lb_probe.hana-load-balancer-secondary[0].id
134134
idle_timeout_in_minutes = 30
135-
enable_floating_ip = "true"
135+
floating_ip_enabled = "true"
136136
}
137137

138138
resource "azurerm_lb_rule" "hanadb_exporter" {
@@ -147,7 +147,7 @@ resource "azurerm_lb_rule" "hanadb_exporter" {
147147
backend_address_pool_ids = [azurerm_lb_backend_address_pool.hana-load-balancer[0].id]
148148
probe_id = azurerm_lb_probe.hana-load-balancer[0].id
149149
idle_timeout_in_minutes = 30
150-
enable_floating_ip = "true"
150+
floating_ip_enabled = "true"
151151
}
152152

153153
# hana network configuration
@@ -225,7 +225,7 @@ resource "azurerm_netapp_volume" "hana-netapp-volume-data" {
225225

226226
export_policy_rule {
227227
rule_index = 1
228-
protocols_enabled = ["NFSv4.1"]
228+
protocol = ["NFSv4.1"]
229229
allowed_clients = ["0.0.0.0/0"]
230230
unix_read_write = true
231231
root_access_enabled = true
@@ -261,7 +261,7 @@ resource "azurerm_netapp_volume" "hana-netapp-volume-log" {
261261

262262
export_policy_rule {
263263
rule_index = 1
264-
protocols_enabled = ["NFSv4.1"]
264+
protocol = ["NFSv4.1"]
265265
allowed_clients = ["0.0.0.0/0"]
266266
unix_read_write = true
267267
root_access_enabled = true
@@ -297,7 +297,7 @@ resource "azurerm_netapp_volume" "hana-netapp-volume-backup" {
297297

298298
export_policy_rule {
299299
rule_index = 1
300-
protocols_enabled = ["NFSv4.1"]
300+
protocol = ["NFSv4.1"]
301301
allowed_clients = ["0.0.0.0/0"]
302302
unix_read_write = true
303303
root_access_enabled = true
@@ -333,7 +333,7 @@ resource "azurerm_netapp_volume" "hana-netapp-volume-shared" {
333333

334334
export_policy_rule {
335335
rule_index = 1
336-
protocols_enabled = ["NFSv4.1"]
336+
protocol = ["NFSv4.1"]
337337
allowed_clients = ["0.0.0.0/0"]
338338
unix_read_write = true
339339
root_access_enabled = true
@@ -451,4 +451,4 @@ module "hana_majority_maker" {
451451
tenant_id = var.tenant_id
452452
fence_agent_app_id = var.fence_agent_app_id
453453
fence_agent_client_secret = var.fence_agent_client_secret
454-
}
454+
}

‎terraform/azure/modules/netweaver_node/main.tf‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ resource "azurerm_lb_probe" "netweaver-ers-health-probe" {
139139
# backend_address_pool_id = azurerm_lb_backend_address_pool.netweaver-backend-pool[0].id
140140
# probe_id = azurerm_lb_probe.netweaver-health-probe[0].id
141141
# idle_timeout_in_minutes = 30
142-
# enable_floating_ip = "true"
142+
# floating_ip_enabled = "true"
143143
#}
144144

145145
#resource "azurerm_lb_rule" "netweaver-lb-ha-ers" {
@@ -154,7 +154,7 @@ resource "azurerm_lb_probe" "netweaver-ers-health-probe" {
154154
# backend_address_pool_id = azurerm_lb_backend_address_pool.netweaver-backend-pool[1].id
155155
# probe_id = azurerm_lb_probe.netweaver-health-probe[1].id
156156
# idle_timeout_in_minutes = 30
157-
# enable_floating_ip = "true"
157+
# floating_ip_enabled = "true"
158158
#}
159159

160160
resource "azurerm_lb_rule" "ascs-lb-rules" {
@@ -169,7 +169,7 @@ resource "azurerm_lb_rule" "ascs-lb-rules" {
169169
backend_address_pool_ids = [azurerm_lb_backend_address_pool.netweaver-backend-pool[0].id]
170170
probe_id = azurerm_lb_probe.netweaver-ascs-health-probe[0].id
171171
idle_timeout_in_minutes = 30
172-
enable_floating_ip = "true"
172+
floating_ip_enabled = "true"
173173
}
174174

175175
resource "azurerm_lb_rule" "ers-lb-rules" {
@@ -184,7 +184,7 @@ resource "azurerm_lb_rule" "ers-lb-rules" {
184184
backend_address_pool_ids = [azurerm_lb_backend_address_pool.netweaver-backend-pool[0].id]
185185
probe_id = azurerm_lb_probe.netweaver-ers-health-probe[0].id
186186
idle_timeout_in_minutes = 30
187-
enable_floating_ip = "true"
187+
floating_ip_enabled = "true"
188188
}
189189

190190
# netweaver network configuration
@@ -300,7 +300,7 @@ resource "azurerm_netapp_volume" "netweaver-netapp-volume-sapmnt" {
300300

301301
export_policy_rule {
302302
rule_index = 1
303-
protocols_enabled = ["NFSv4.1"]
303+
protocol = ["NFSv4.1"]
304304
allowed_clients = ["0.0.0.0/0"]
305305
unix_read_write = true
306306
root_access_enabled = true

‎terraform/gcp/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For detailed information and deployment options have a look at `terraform.tfvars
5353
5454
* Log in with `gcloud init`.
5555
56-
Note: You must run this command to use the Gcloud SDK and to apply this Terraform configuration:
56+
**Note**: You must run this command to use the Gcloud SDK and to apply this Terraform configuration:
5757
5858
``` shell
5959
export GOOGLE_APPLICATION_CREDENTIALS=/path/to/<PROJECT-ID>-xxxxxxxxx.json

0 commit comments

Comments
 (0)