diff --git a/solutions/ibm-catalog/sap-ready-to-go/README.md b/solutions/ibm-catalog/sap-ready-to-go/README.md index c8f243d1..b7ced29a 100644 --- a/solutions/ibm-catalog/sap-ready-to-go/README.md +++ b/solutions/ibm-catalog/sap-ready-to-go/README.md @@ -83,7 +83,7 @@ | [powervs\_os\_registration\_username](#input\_powervs\_os\_registration\_username) | If you're using a byol or a custom RHEL/SLES image for SAP HANA and Netweaver you need to provide your OS registration credentials here. Leave empty if you're using an IBM provided subscription (FLS). | `string` | `""` | no | | [powervs\_sap\_network\_cidr](#input\_powervs\_sap\_network\_cidr) | Network range for dedicated SAP network. Used for communication between SAP Application servers with SAP HANA Database. E.g., '10.53.0.0/24' | `string` | `"10.53.0.0/24"` | no | | [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location corresponding to the location used in 'Power Virtual Server with VPC landing zone' pre-requisite deployment. | `string` | n/a | yes | -| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6. | `string` | n/a | yes | +| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters. | `string` | n/a | yes | | [prerequisite\_workspace\_id](#input\_prerequisite\_workspace\_id) | IBM Cloud Schematics workspace ID of an existing 'Power Virtual Server with VPC landing zone' catalog solution. If you do not yet have an existing deployment, click [here](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-inf-2dd486c7-b317-4aaa-907b-42671485ad96-global?) to create one. | `string` | n/a | yes | | [sap\_domain](#input\_sap\_domain) | SAP network domain name. | `string` | `"sap.com"` | no | | [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) used to login to IBM PowerVS instances. Should match to uploaded public SSH key referenced by 'ssh\_public\_key' which was created previously. The key is temporarily stored and deleted. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes | diff --git a/solutions/ibm-catalog/sap-ready-to-go/variables.tf b/solutions/ibm-catalog/sap-ready-to-go/variables.tf index 1c1032d0..d1a335d2 100644 --- a/solutions/ibm-catalog/sap-ready-to-go/variables.tf +++ b/solutions/ibm-catalog/sap-ready-to-go/variables.tf @@ -15,7 +15,7 @@ variable "powervs_zone" { } variable "prefix" { - description = "Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6." + description = "Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters." type = string validation { condition = length(var.prefix) <= 6 && can(regex("^[A-Za-z0-9]+$", var.prefix)) diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md index 8dc74e32..8fc10101 100644 --- a/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md +++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/README.md @@ -172,7 +172,7 @@ S4HANA_2023 | [powervs\_os\_registration\_username](#input\_powervs\_os\_registration\_username) | If you're using a byol or a custom RHEL image for SAP HANA and Netweaver you need to provide your OS registration credentials here. Leave empty if you're using an IBM provided subscription (FLS). | `string` | `""` | no | | [powervs\_sap\_network\_cidr](#input\_powervs\_sap\_network\_cidr) | Network range for dedicated SAP network. Used for communication between SAP Application servers with SAP HANA Database. E.g., '10.53.0.0/24' | `string` | `"10.53.0.0/24"` | no | | [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location corresponding to the location used in 'Power Virtual Server with VPC landing zone' pre-requisite deployment. | `string` | n/a | yes | -| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6. | `string` | n/a | yes | +| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters. | `string` | n/a | yes | | [prerequisite\_workspace\_id](#input\_prerequisite\_workspace\_id) | IBM Cloud Schematics workspace ID of an existing 'Power Virtual Server with VPC landing zone' catalog solution. If you do not yet have an existing deployment, click [here](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-inf-2dd486c7-b317-4aaa-907b-42671485ad96-global?) to create one. | `string` | n/a | yes | | [sap\_domain](#input\_sap\_domain) | SAP network domain name. | `string` | `"sap.com"` | no | | [sap\_hana\_master\_password](#input\_sap\_hana\_master\_password) | SAP HANA master password. | `string` | n/a | yes | diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/variables.tf b/solutions/ibm-catalog/sap-s4hana-bw4hana/variables.tf index 40adad68..36f3fffe 100644 --- a/solutions/ibm-catalog/sap-s4hana-bw4hana/variables.tf +++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/variables.tf @@ -15,7 +15,7 @@ variable "powervs_zone" { } variable "prefix" { - description = "Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6." + description = "Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters." type = string validation { condition = length(var.prefix) <= 6 && can(regex("^[A-Za-z0-9]+$", var.prefix)) diff --git a/solutions/sap-ready-to-go/README.md b/solutions/sap-ready-to-go/README.md index 48c68855..7aa24657 100644 --- a/solutions/sap-ready-to-go/README.md +++ b/solutions/sap-ready-to-go/README.md @@ -65,7 +65,7 @@ No resources. | [powervs\_ssh\_public\_key\_name](#input\_powervs\_ssh\_public\_key\_name) | Existing PowerVS SSH Public Key Name. | `string` | n/a | yes | | [powervs\_workspace\_guid](#input\_powervs\_workspace\_guid) | PowerVS infrastructure workspace guid. The GUID of the resource instance. | `string` | n/a | yes | | [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS Workspace exists. | `string` | n/a | yes | -| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6. | `string` | n/a | yes | +| [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters. | `string` | n/a | yes | | [sap\_domain](#input\_sap\_domain) | SAP network domain name. | `string` | `"sap.com"` | no | | [sap\_network\_services\_config](#input\_sap\_network\_services\_config) | Configures network services NTP, NFS and DNS on PowerVS instance. Requires 'pi\_instance\_init\_linux' to be specified. | 
object(
    {
      squid = object({ enable = bool, squid_server_ip_port = string, no_proxy_hosts = string })
      nfs   = object({ enable = bool, nfs_server_path = string, nfs_client_path = string, opts = string, fstype = string })
      dns   = object({ enable = bool, dns_server_ip = string })
      ntp   = object({ enable = bool, ntp_server_ip = string })
    }
  )
| 
{
  "dns": {
    "dns_server_ip": "",
    "enable": false
  },
  "nfs": {
    "enable": false,
    "fstype": "",
    "nfs_client_path": "",
    "nfs_server_path": "",
    "opts": ""
  },
  "ntp": {
    "enable": false,
    "ntp_server_ip": ""
  },
  "squid": {
    "enable": false,
    "no_proxy_hosts": "",
    "squid_server_ip_port": ""
  }
}
| no | | [scc\_wp\_instance](#input\_scc\_wp\_instance) | SCC Workload Protection instance to connect to. Set enable to false to not use it. | 
object({
    enable             = bool
    guid               = string,
    access_key         = string,
    api_endpoint       = string,
    ingestion_endpoint = string
  })
| 
{
  "access_key": "",
  "api_endpoint": "",
  "enable": false,
  "guid": "",
  "ingestion_endpoint": ""
}
| no | diff --git a/solutions/sap-ready-to-go/variables.tf b/solutions/sap-ready-to-go/variables.tf index a8eec292..a41cbae2 100644 --- a/solutions/sap-ready-to-go/variables.tf +++ b/solutions/sap-ready-to-go/variables.tf @@ -10,7 +10,7 @@ variable "powervs_zone" { } variable "prefix" { - description = "Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6." + description = "Unique prefix for resources to be created (e.g., SAP system name). Must be an alphanumeric string with maximum length of 6 characters." type = string validation { condition = length(var.prefix) <= 6 && can(regex("^[A-Za-z0-9]+$", var.prefix))