Skip to content

Commit 8886091

Browse files
yeoldegroveyeoldegrove
committed
Merge branch 'develop' of ssh://github.com/SUSE/ha-sap-terraform-deployments into azure_fencing_msi
2 parents 6662f6e + f2a6477 commit 8886091

File tree

9 files changed

+57
-64
lines changed

9 files changed

+57
-64
lines changed

‎aws/terraform.tfvars.example‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ aws_credentials = "~/.aws/credentials"
5252
#}
5353

5454
# Default os_image and os_owner. These values are not used if the specific values are set (e.g.: hana_os_image)
55-
# BYOS example with sles4sap 15 sp1 (this value is a pattern, it will select the latest version that matches this name)
56-
#os_image = "suse-sles-sap-15-sp1-byos"
55+
# BYOS example with sles4sap 15 sp3 (this value is a pattern, it will select the latest version that matches this name)
56+
#os_image = "suse-sles-sap-15-sp3-byos"
5757
#os_owner = "amazon"
5858

5959
# The project requires a pair of SSH keys (public and private) to provision the machines
@@ -252,7 +252,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
252252
#iscsi_name = "vmiscsi"
253253

254254
# iSCSI server image. By default, PAYG image is used. The usage is the same as the HANA images
255-
#iscsi_os_image = "suse-sles-sap-15-sp1-byos"
255+
#iscsi_os_image = "suse-sles-sap-15-sp3-byos"
256256
#iscsi_os_owner = "amazon"
257257

258258
# iSCSI server address. It should be in same iprange as hana_ips
@@ -273,7 +273,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
273273
#monitoring_name = "vmmonitoring"
274274

275275
# Monitoring server image. By default, PAYG image is used. The usage is the same as the HANA images
276-
#monitoring_os_image = "suse-sles-sap-15-sp1-byos"
276+
#monitoring_os_image = "suse-sles-sap-15-sp3-byos"
277277
#monitoring_os_owner = "amazon"
278278

279279
# IP address of the machine where Prometheus and Grafana are running. Must be in 10.0.0.0/24 subnet
@@ -293,7 +293,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
293293
#drbd_instancetype = "t3.medium"
294294

295295
# DRBD machines image. By default, PAYG image is used. The usage is the same as the HANA images
296-
#drbd_os_image = "suse-sles-sap-15-sp1-byos"
296+
#drbd_os_image = "suse-sles-sap-15-sp3-byos"
297297
#drbd_os_owner = "amazon"
298298

299299
#drbd_data_disk_size = 15
@@ -332,7 +332,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
332332
#netweaver_instancetype = "r5.large"
333333

334334
# Netweaver machines image. By default, PAYG image is used. The usage is the same as the HANA images
335-
#netweaver_os_image = "suse-sles-sap-15-sp1-byos"
335+
#netweaver_os_image = "suse-sles-sap-15-sp3-byos"
336336
#netweaver_os_owner = "amazon"
337337

338338
#netweaver_ips = ["10.0.2.7", "10.0.3.8", "10.0.2.9", "10.0.3.10"]

‎aws/variables.tf‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ variable "network_domain" {
104104
variable "os_image" {
105105
description = "Default OS image for all the machines. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
106106
type = string
107-
default = "suse-sles-sap-15-sp2"
107+
default = "suse-sles-sap-15-sp3"
108108
}
109109

110110
variable "os_owner" {
@@ -213,7 +213,7 @@ variable "hana_count" {
213213
}
214214

215215
variable "hana_os_image" {
216-
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp1-byos)"
216+
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
217217
type = string
218218
default = ""
219219
}
@@ -237,7 +237,7 @@ variable "hana_subnet_address_range" {
237237
}
238238

239239
variable "hana_ips" {
240-
description = "ip addresses to set to the nodes. The first ip must be in 10.0.0.0/24 subnet and the second in 10.0.1.0/24 subnet"
240+
description = "ip addresses to set to the HANA nodes. The first ip must be in 10.0.0.0/24 subnet and the second in 10.0.1.0/24 subnet"
241241
type = list(string)
242242
default = []
243243
validation {
@@ -478,7 +478,7 @@ variable "drbd_enabled" {
478478
}
479479

480480
variable "drbd_os_image" {
481-
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp1-byos)"
481+
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
482482
type = string
483483
default = ""
484484
}
@@ -587,7 +587,7 @@ variable "iscsi_network_domain" {
587587
}
588588

589589
variable "iscsi_os_image" {
590-
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp1-byos)"
590+
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
591591
type = string
592592
default = ""
593593
}
@@ -642,7 +642,7 @@ variable "monitoring_network_domain" {
642642
}
643643

644644
variable "monitoring_os_image" {
645-
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp1-byos)"
645+
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
646646
type = string
647647
default = ""
648648
}
@@ -704,7 +704,7 @@ variable "netweaver_app_server_count" {
704704
}
705705

706706
variable "netweaver_os_image" {
707-
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp1-byos)"
707+
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
708708
type = string
709709
default = ""
710710
}

‎azure/terraform.tfvars.example‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ admin_user = "cloudadmin"
6060
# Default os_image. This value is not used if the specific values are set (e.g.: hana_os_image)
6161
# Run the next command to get the possible options and use the 4th column value (version can be changed by `latest`)
6262
# az vm image list --output table --publisher SUSE --all
63-
# BYOS example with sles4sap 15 sp2 (this value is a pattern, it will select the latest version that matches this name)
64-
#os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
63+
# BYOS example with sles4sap 15 sp3 (this value is a pattern, it will select the latest version that matches this name)
64+
#os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
6565

6666
# The project requires a pair of SSH keys (public and private) to provision the machines
6767
# The private key is only used to create the SSH connection, it is not uploaded to the machines
@@ -146,7 +146,7 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
146146

147147
# Bastion machine os image. If it is not provided, the os_image variable data is used
148148
# BYOS example
149-
# bastion_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
149+
# bastion_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
150150

151151
#########################
152152
# HANA machines variables
@@ -242,7 +242,7 @@ hana_count = "2"
242242

243243
# Public OS images
244244
# BYOS example
245-
# hana_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
245+
# hana_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
246246

247247
# The next variables define how the HANA installation software is obtained.
248248
# The installation software must be located in a Azure storage account
@@ -347,7 +347,7 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
347347
#iscsi_srv_uri = "/path/to/your/iscsi/image"
348348

349349
# Public image usage for iSCSI. BYOS example
350-
#iscsi_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
350+
#iscsi_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
351351

352352
# IP address of the iSCSI server. If it's not set the address will be auto generated from the provided vnet address range
353353
#iscsi_srv_ip = "10.74.1.14"
@@ -364,7 +364,7 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
364364
#monitoring_uri = "/path/to/your/monitoring/image"
365365

366366
# Public image usage for the monitoring server. BYOS example
367-
#monitoring_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
367+
#monitoring_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
368368

369369
# Enable the host to be monitored by exporters
370370
#monitoring_enabled = true
@@ -389,7 +389,7 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
389389
#drbd_image_uri = "/path/to/your/monitoring/image"
390390

391391
# Public image usage for the DRBD machines. BYOS example
392-
#drbd_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
392+
#drbd_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
393393

394394
# Each drbd cluster host IP address (sequential order). If it's not set the addresses will be auto generated from the provided vnet address range
395395
#drbd_ips = ["10.74.1.21", "10.74.1.22"]
@@ -422,7 +422,7 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
422422
#netweaver_image_uri = "/path/to/your/monitoring/image"
423423

424424
# Public image usage for the Netweaver machines. BYOS example
425-
#netweaver_os_image = "SUSE:sles-sap-15-sp2-byos:gen2:latest"
425+
#netweaver_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
426426

427427
# If the addresses are not set they will be auto generated from the provided vnet address range
428428
#netweaver_ips = ["10.74.1.30", "10.74.1.31", "10.74.1.32", "10.74.1.33"]

‎azure/variables.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ variable "bastion_enabled" {
116116
}
117117

118118
variable "bastion_os_image" {
119-
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
119+
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
120120
type = string
121121
default = ""
122122
}
@@ -154,9 +154,9 @@ variable "network_domain" {
154154
}
155155

156156
variable "os_image" {
157-
description = "Default OS image for all the machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: 'SUSE:sles-sap-15-sp2:gen2:latest'. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
157+
description = "Default OS image for all the machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: 'SUSE:sles-sap-15-sp3:gen2:latest'. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
158158
type = string
159-
default = "SUSE:sles-sap-15-sp2:gen2:latest"
159+
default = "SUSE:sles-sap-15-sp3:gen2:latest"
160160
}
161161

162162
variable "timezone" {
@@ -259,7 +259,7 @@ variable "hana_count" {
259259
}
260260

261261
variable "hana_os_image" {
262-
description = "sles4sap image used to create the HANA machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
262+
description = "sles4sap image used to create the HANA machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
263263
type = string
264264
default = ""
265265
}
@@ -569,7 +569,7 @@ variable "iscsi_network_domain" {
569569
}
570570

571571
variable "iscsi_os_image" {
572-
description = "sles4sap image used to create the ISCSI machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
572+
description = "sles4sap image used to create the ISCSI machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
573573
type = string
574574
default = ""
575575
}
@@ -636,7 +636,7 @@ variable "monitoring_vm_size" {
636636
}
637637

638638
variable "monitoring_os_image" {
639-
description = "sles4sap image used to create the Monitoring server machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
639+
description = "sles4sap image used to create the Monitoring server machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
640640
type = string
641641
default = ""
642642
}
@@ -692,7 +692,7 @@ variable "drbd_ips" {
692692
}
693693

694694
variable "drbd_os_image" {
695-
description = "sles4sap image used to create the DRBD machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
695+
description = "sles4sap image used to create the DRBD machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
696696
type = string
697697
default = ""
698698
}
@@ -760,7 +760,7 @@ variable "netweaver_app_server_count" {
760760
}
761761

762762
variable "netweaver_os_image" {
763-
description = "sles4sap image used to create the Netweaver machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
763+
description = "sles4sap image used to create the Netweaver machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
764764
type = string
765765
default = ""
766766
}

‎gcp/terraform.tfvars.example‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ region = "europe-west1"
5555
# gcloud compute images list --standard-images --filter=sles
5656
# Combine the project and name values. The version part can be ignored to get the latest version
5757
# BYOS images are usually available using `suse-byos-cloud` and addind `byos` sufix to the nanem
58-
#os_image = "suse-byos-cloud/sles-15-sp1-sap-byos"
58+
#os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
5959

6060
# The project requires a pair of SSH keys (public and private) to provision the machines
6161
# The private key is only used to create the SSH connection, it is not uploaded to the machines
@@ -140,7 +140,7 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
140140

141141
# Bastion machine os image. If it is not provided, the os_image variable data is used
142142
# BYOS example
143-
# bastion_os_image = """suse-byos-cloud/sles-15-sp2-sap-byos""
143+
# bastion_os_image = """suse-byos-cloud/sles-15-sp3-sap-byos""
144144

145145
# Minimum ports per VM instance for the NAT router. Decreasing this value can compromise the deployment and make it fail
146146
# This value is a number between 1 and 1024
@@ -163,7 +163,7 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
163163
# gcloud compute images list --standard-images --filter=sles
164164
# Combine the project and name values. The version part can be ignored to get the latest version
165165
# BYOS images are usually available using `suse-byos-cloud` and adding `byos` suffix to the name
166-
#hana_os_image = "suse-byos-cloud/sles-15-sp1-sap-byos"
166+
#hana_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
167167

168168
# Disk type for HANA
169169
#hana_data_disk_type = "pd-ssd"
@@ -285,7 +285,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
285285
#iscsi_name = "vmiscsi"
286286

287287
# iSCSI server image. By default, PAYG image is used. The usage is the same as the HANA images
288-
#iscsi_os_image = "suse-byos-cloud/sles-15-sp2-sap-byos"
288+
#iscsi_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
289289

290290
# iSCSI server address
291291
#iscsi_srv_ip = "10.0.0.4"
@@ -308,7 +308,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
308308
#monitoring_name = "vmmonitoring"
309309

310310
# Monitoring server image. By default, PAYG image is used. The usage is the same as the HANA images
311-
#monitoring_os_image = "suse-byos-cloud/sles-15-sp2-sap-byos"
311+
#monitoring_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
312312

313313
# IP address of the machine where Prometheus and Grafana are running
314314
#monitoring_srv_ip = "10.0.0.5"
@@ -326,7 +326,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
326326
#drbd_machine_type = "n1-standard-4"
327327

328328
# DRBD machines image. By default, PAYG image is used. The usage is the same as the HANA images
329-
#drbd_os_image = "suse-byos-cloud/sles-15-sp2-sap-byos"
329+
#drbd_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
330330

331331
#drbd_data_disk_size = 15
332332

@@ -370,7 +370,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
370370
#netweaver_machine_type = "n1-standard-8"
371371

372372
# Netweaver machines image. By default, PAYG image is used. The usage is the same as the HANA images
373-
#netweaver_os_image = "suse-byos-cloud/sles-15-sp2-sap-byos"
373+
#netweaver_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
374374

375375
# Set the Netweaver product id. The 'HA' sufix means that the installation uses an ASCS/ERS cluster
376376
# Below are the supported SAP Netweaver product ids if using SWPM version 1.0:

‎gcp/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ variable "bastion_enabled" {
8080
}
8181

8282
variable "bastion_os_image" {
83-
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
83+
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
8484
type = string
8585
default = ""
8686
}
@@ -126,7 +126,7 @@ variable "network_domain" {
126126
variable "os_image" {
127127
description = "Default OS image for all the machines. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
128128
type = string
129-
default = "suse-sap-cloud/sles-15-sp2-sap"
129+
default = "suse-sap-cloud/sles-15-sp3-sap"
130130
}
131131

132132
variable "timezone" {

‎openstack/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ variable "bastion_data_disk_size" {
140140
}
141141

142142
variable "bastion_os_image" {
143-
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp2:gen2:latest"
143+
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
144144
type = string
145145
default = ""
146146
}
@@ -180,7 +180,7 @@ variable "network_domain" {
180180
variable "os_image" {
181181
description = "Default OS image for all the machines. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
182182
type = string
183-
default = "suse-sap-cloud/sles-15-sp2-sap"
183+
default = "suse-sap-cloud/sles-15-sp3-sap"
184184
}
185185

186186
variable "timezone" {

‎requirements.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
hana_node:
33
python-shaptools: 0.3.12+git.1619007514.1951d23
44
python3-shaptools: 0.3.12+git.1619007514.1951d23
5-
salt-shaptools: 0.3.15+git.1647616051.329993c
5+
salt-shaptools: 0.3.16+git.1651132315.e44edee
66
habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
77
saphanabootstrap-formula: 0.9.0+git.1644311138.1ee99f3
88
drbd_node:
99
python-shaptools: 0.3.12+git.1619007514.1951d23
1010
python3-shaptools: 0.3.12+git.1619007514.1951d23
11-
salt-shaptools: 0.3.15+git.1647616051.329993c
11+
salt-shaptools: 0.3.16+git.1651132315.e44edee
1212
habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
1313
drbd-formula: 0.5.0+git.1637569723.cf85049
1414
netweaver_node:
1515
python-shaptools: 0.3.12+git.1619007514.1951d23
1616
python3-shaptools: 0.3.12+git.1619007514.1951d23
17-
salt-shaptools: 0.3.15+git.1647616051.329993c
17+
salt-shaptools: 0.3.16+git.1651132315.e44edee
1818
habootstrap-formula: 0.4.4+git.1644311144.3dc7a98
1919
sapnwbootstrap-formula: 0.7.4+git.1646147057.78b198a
2020
iscsi_srv:

0 commit comments

Comments
 (0)