Skip to content

Commit

Permalink
update images to SLES 15 SP4 everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
yeoldegrove committed Aug 23, 2022
1 parent 6773262 commit d864684
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ The following features are implemented:

| Feature | AWS | Azure | GCP | OpenStack | Libvirt |
| :------ | :---: | :---: | :---: | :-------: | :-----: |
| **SUSE saptune / SAP sapnotes** <br> SUSE's saptune is applied with the correct solution template to configure the systems based on SAP sapnotes recommendations. <br> For additional information see [Tuning Systems with saptune🔗](https://documentation.suse.com/sles-sap/15-SP3/html/SLES-SAP-guide/cha-tune.html). ||||||
| **SUSE saptune / SAP sapnotes** <br> SUSE's saptune is applied with the correct solution template to configure the systems based on SAP sapnotes recommendations. <br> For additional information see [Tuning Systems with saptune🔗](https://documentation.suse.com/sles-sap/15-SP4/html/SLES-SAP-guide/cha-tune.html). ||||||
| **HANA single node** <br> Deployment of HANA on a single node. <br> For additional information see [SAP Hardware Directory for AWS🔗](https://www.sap.com/dmc/exp/2014-09-02-hana-hardware/enEN/#/solutions?filters=ve:23) ||||||
| **HANA Scale-Up - performance optimized** <br> Deployment of HANA with system replication in a performance optimized setup. <br> For addition information see [SAP HANA System Replication Scale-Up - Performance Optimized Scenario🔗](https://documentation.suse.com/sbp/all/single-html/SLES4SAP-hana-sr-guide-PerfOpt-15/). ||||||
| **HANA Scale-Up - cost optimized** <br> Deployment of HANA with system replication in a cost optimized (additional tenant DB) setup. <br> For additional information see [SAP HANA System Replication Scale-Up - Cost Optimized Scenario🔗](https://documentation.suse.com/sbp/all/html/SLES4SAP-hana-sr-guide-costopt-15/). ||||||
Expand Down
16 changes: 8 additions & 8 deletions aws/terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ aws_credentials = "~/.aws/credentials"
#}

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

# The project requires a pair of SSH keys (public and private) to provision the machines
Expand Down Expand Up @@ -95,13 +95,13 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP4/"
#
## Development Release (use if on `develop` branch)
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP4/"

# Provisioning log level (error by default)
#provisioning_log_level = "info"
Expand Down Expand Up @@ -321,7 +321,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
#iscsi_name = "vmiscsi"

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

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

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

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

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

#drbd_data_disk_size = 15
Expand Down Expand Up @@ -401,7 +401,7 @@ hana_inst_master = "s3://sapdata/sap_inst_media/51053381"
#netweaver_instancetype = "r5.large"

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

#netweaver_ips = ["10.0.2.7", "10.0.3.8", "10.0.2.9", "10.0.3.10"]
Expand Down
12 changes: 6 additions & 6 deletions aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ variable "network_domain" {
variable "os_image" {
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)"
type = string
default = "suse-sles-sap-15-sp3"
default = "suse-sles-sap-15-sp4"
}

variable "os_owner" {
Expand Down Expand Up @@ -287,7 +287,7 @@ variable "bastion_private_key" {

## Hana variables
variable "hana_os_image" {
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp4-byos)"
type = string
default = ""
}
Expand Down Expand Up @@ -601,7 +601,7 @@ variable "drbd_enabled" {
}

variable "drbd_os_image" {
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp4-byos)"
type = string
default = ""
}
Expand Down Expand Up @@ -710,7 +710,7 @@ variable "iscsi_network_domain" {
}

variable "iscsi_os_image" {
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp4-byos)"
type = string
default = ""
}
Expand Down Expand Up @@ -765,7 +765,7 @@ variable "monitoring_network_domain" {
}

variable "monitoring_os_image" {
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp4-byos)"
type = string
default = ""
}
Expand Down Expand Up @@ -827,7 +827,7 @@ variable "netweaver_app_server_count" {
}

variable "netweaver_os_image" {
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp3-byos)"
description = "sles4sap AMI image identifier or a pattern used to find the image name (e.g. suse-sles-sap-15-sp4-byos)"
type = string
default = ""
}
Expand Down
20 changes: 10 additions & 10 deletions azure/terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ admin_user = "cloudadmin"
# Default os_image. This value is not used if the specific values are set (e.g.: hana_os_image)
# Run the next command to get the possible options and use the 4th column value (version can be changed by `latest`)
# az vm image list --output table --publisher SUSE --all
# BYOS example with sles4sap 15 sp3 (this value is a pattern, it will select the latest version that matches this name)
#os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
# BYOS example with sles4sap 15 sp4 (this value is a pattern, it will select the latest version that matches this name)
#os_image = "SUSE:sles-sap-15-sp4-byos:gen2:latest"

# The project requires a pair of SSH keys (public and private) to provision the machines
# The private key is only used to create the SSH connection, it is not uploaded to the machines
Expand Down Expand Up @@ -102,13 +102,13 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP4/"
#
## Development Release (use if on `develop` branch)
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP4/"

# Provisioning log level (error by default)
#provisioning_log_level = "info"
Expand Down Expand Up @@ -162,7 +162,7 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"

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

#########################
# HANA machines variables
Expand Down Expand Up @@ -284,7 +284,7 @@ hana_scale_out_anf_quota_shared = "2000" # deployed 2x (for each site)

# Public OS images
# BYOS example
# hana_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
# hana_os_image = "SUSE:sles-sap-15-sp4-byos:gen2:latest"

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

# Public image usage for iSCSI. BYOS example
#iscsi_os_image = "SUSE:sles-sap-15-sp3-byos:gen2:latest"
#iscsi_os_image = "SUSE:sles-sap-15-sp4-byos:gen2:latest"

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

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

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

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

# 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
#drbd_ips = ["10.74.1.21", "10.74.1.22"]
Expand Down Expand Up @@ -464,7 +464,7 @@ hana_inst_master = "//YOUR_STORAGE_ACCOUNT_NAME.file.core.windows.net/sapdata/sa
#netweaver_image_uri = "/path/to/your/monitoring/image"

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

# If the addresses are not set they will be auto generated from the provided vnet address range
#netweaver_ips = ["10.74.1.30", "10.74.1.31", "10.74.1.32", "10.74.1.33"]
Expand Down
16 changes: 8 additions & 8 deletions azure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ variable "bastion_enabled" {
}

variable "bastion_os_image" {
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
description = "sles4sap image used to create the bastion machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down Expand Up @@ -155,9 +155,9 @@ variable "network_domain" {
}

variable "os_image" {
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)"
description = "Default OS image for all the machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: 'SUSE:sles-sap-15-sp4:gen2:latest'. This value is not used if the specific nodes os_image is set (e.g. hana_os_image)"
type = string
default = "SUSE:sles-sap-15-sp3:gen2:latest"
default = "SUSE:sles-sap-15-sp4:gen2:latest"
}

variable "timezone" {
Expand Down Expand Up @@ -260,7 +260,7 @@ variable "hana_count" {
}

variable "hana_os_image" {
description = "sles4sap image used to create the HANA machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
description = "sles4sap image used to create the HANA machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down Expand Up @@ -579,7 +579,7 @@ variable "iscsi_network_domain" {
}

variable "iscsi_os_image" {
description = "sles4sap image used to create the ISCSI machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
description = "sles4sap image used to create the ISCSI machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down Expand Up @@ -646,7 +646,7 @@ variable "monitoring_vm_size" {
}

variable "monitoring_os_image" {
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"
description = "sles4sap image used to create the Monitoring server machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down Expand Up @@ -702,7 +702,7 @@ variable "drbd_ips" {
}

variable "drbd_os_image" {
description = "sles4sap image used to create the DRBD machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
description = "sles4sap image used to create the DRBD machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down Expand Up @@ -770,7 +770,7 @@ variable "netweaver_app_server_count" {
}

variable "netweaver_os_image" {
description = "sles4sap image used to create the Netweaver machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp3:gen2:latest"
description = "sles4sap image used to create the Netweaver machines. Composed by 'Publisher:Offer:Sku:Version' syntax. Example: SUSE:sles-sap-15-sp4:gen2:latest"
type = string
default = ""
}
Expand Down
18 changes: 9 additions & 9 deletions gcp/terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ region = "europe-west1"
# gcloud compute images list --standard-images --filter=sles
# Combine the project and name values. The version part can be ignored to get the latest version
# BYOS images are usually available using `suse-byos-cloud` and addind `byos` sufix to the nanem
#os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
#os_image = "suse-byos-cloud/sles-15-sp4-sap-byos"

# The project requires a pair of SSH keys (public and private) to provision the machines
# The private key is only used to create the SSH connection, it is not uploaded to the machines
Expand Down Expand Up @@ -96,13 +96,13 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP4/"
#
## Development Release (use if on `develop` branch)
# To auto detect the SLE version
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/"
# Otherwise use a specific SLE version:
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP3/"
#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP4/"

# Provisioning log level (error by default)
#provisioning_log_level = "info"
Expand Down Expand Up @@ -149,7 +149,7 @@ cluster_ssh_key = "salt://sshkeys/cluster.id_rsa"

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

# Minimum ports per VM instance for the NAT router. Decreasing this value can compromise the deployment and make it fail
# This value is a number between 1 and 1024
Expand Down Expand Up @@ -177,7 +177,7 @@ hana_count = "2"
# gcloud compute images list --standard-images --filter=sles
# Combine the project and name values. The version part can be ignored to get the latest version
# BYOS images are usually available using `suse-byos-cloud` and adding `byos` suffix to the name
#hana_os_image = "suse-byos-cloud/sles-15-sp3-sap-byos"
#hana_os_image = "suse-byos-cloud/sles-15-sp4-sap-byos"
#
# Number of nodes in the cluster
# 2 nodes will always be scale-up
Expand Down Expand Up @@ -358,7 +358,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
#iscsi_name = "vmiscsi"

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

# iSCSI server address
#iscsi_srv_ip = "10.0.0.4"
Expand All @@ -381,7 +381,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
#monitoring_name = "vmmonitoring"

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

# IP address of the machine where Prometheus and Grafana are running
#monitoring_srv_ip = "10.0.0.5"
Expand All @@ -399,7 +399,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
#drbd_machine_type = "n1-standard-4"

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

#drbd_data_disk_size = 15

Expand Down Expand Up @@ -443,7 +443,7 @@ hana_inst_master = "MyHanaBucket/sapdata/sap_inst_media/51053381"
#netweaver_machine_type = "n1-standard-8"

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

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

0 comments on commit d864684

Please sign in to comment.