fix: ocp variation improvements

.trivyignore

@@ -0,0 +1 @@
+AVD-AZU-0012

ibm_catalog.json

@@ -192,7 +192,6 @@
             {
               "key": "ssh_public_key",
               "type": "multiline_secure_value",
-              "display_name": "ssh_public_key",
               "required": true,
               "custom_config": {
                 "grouping": "deployment",
@@ -203,7 +202,6 @@
             {
               "key": "ssh_private_key",
               "type": "multiline_secure_value",
-              "display_name": "ssh_private_key",
               "required": true,
               "custom_config": {
                 "grouping": "deployment",
@@ -250,7 +248,6 @@
             {
               "key": "powervs_custom_image_cos_service_credentials",
               "type": "multiline_secure_value",
-              "display_name": "powervs_custom_image_cos_service_credentials",
               "custom_config": {
                 "grouping": "deployment",
                 "original_grouping": "deployment",
@@ -288,7 +285,12 @@
             {
               "key": "ansible_vault_password",
               "type": "multiline_secure_value",
-              "display_name": "ansible_vault_password"
+              "required": true,
+              "custom_config": {
+                "type": "multiline_secure_value",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "enable_monitoring"
@@ -692,7 +694,6 @@
               "key": "ssh_public_key",
               "required": true,
               "type": "multiline_secure_value",
-              "display_name": "ssh_public_key",
               "custom_config": {
                 "grouping": "deployment",
                 "original_grouping": "deployment",
@@ -703,7 +704,6 @@
               "key": "ssh_private_key",
               "required": true,
               "type": "multiline_secure_value",
-              "display_name": "ssh_private_key",
               "custom_config": {
                 "grouping": "deployment",
                 "original_grouping": "deployment",
@@ -724,8 +724,12 @@
             {
               "key": "ansible_vault_password",
               "type": "multiline_secure_value",
-              "display_name": "ansible_vault_password",
-              "required": true
+              "required": true,
+              "custom_config": {
+                "type": "multiline_secure_value",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "custom_profile_instance_boot_image",
@@ -1199,7 +1203,6 @@
             {
               "key": "ssh_public_key",
               "type": "multiline_secure_value",
-              "display_name": "ssh_public_key",
               "required": true,
               "custom_config": {
                 "grouping": "deployment",
@@ -1210,7 +1213,6 @@
             {
               "key": "ssh_private_key",
               "type": "multiline_secure_value",
-              "display_name": "ssh_private_key",
               "required": true,
               "custom_config": {
                 "grouping": "deployment",
@@ -1232,40 +1234,46 @@
             {
               "key": "user_id",
               "type": "string",
-              "display_name": "user_id",
               "required": true
             },
             {
               "key": "openshift_pull_secret",
               "type": "multiline_secure_value",
-              "display_name": "openshift_pull_secret",
-              "required": true
+              "required": true,
+              "custom_config": {
+                "type": "multiline_secure_value",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "cluster_base_domain",
               "type": "string",
-              "display_name": "cluster_base_domain",
               "required": true
             },
             {
               "key": "openshift_release",
-              "type": "string",
-              "display_name": "openshift_release"
+              "type": "string"
             },
             {
               "key": "cluster_network_config",
-              "type": "code_editor",
-              "display_name": "cluster_network_config"
+              "type": "code_editor"
             },
             {
               "key": "cluster_master_node_config",
-              "type": "code_editor",
-              "display_name": "cluster_master_node_config"
+              "custom_config": {
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "type": "code_editor"
+              }
             },
             {
               "key": "cluster_worker_node_config",
-              "type": "code_editor",
-              "display_name": "cluster_worker_node_config"
+              "custom_config": {
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "type": "code_editor"
+              }
             },
             {
               "key": "tags"
@@ -1287,8 +1295,12 @@
             {
               "key": "ansible_vault_password",
               "type": "multiline_secure_value",
-              "display_name": "ansible_vault_password",
-              "required": true
+              "required": true,
+              "custom_config": {
+                "type": "multiline_secure_value",
+                "grouping": "deployment",
+                "original_grouping": "deployment"
+              }
             },
             {
               "key": "enable_monitoring"
@@ -1472,10 +1484,6 @@
               {
                 "title": "Monitoring Instance and Monitoring Intel VSI Host",
                 "description": "Optional"
-              },
-              {
-                "title": "Bring your own image to PowerVS",
-                "description": "Optional"
               }
             ],
             "diagrams": [

modules/powervs-vpc-landing-zone/README.md

@@ -165,8 +165,8 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
 | <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |
 | <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. Must contain only lowercase letters, numbers, and - characters. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters. | `string` | n/a | yes |
 | <a name="input_sm_service_plan"></a> [sm\_service\_plan](#input\_sm\_service\_plan) | The service/pricing plan to use when provisioning a new Secrets Manager instance. Allowed values: `standard` and `trial`. Only used if `existing_sm_instance_guid` is set to null. | `string` | `"standard"` | no |
-| <a name="input_ssh_private_key"></a> [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh\_public\_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes |
-| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region. | `string` | n/a | yes |
+| <a name="input_ssh_private_key"></a> [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh\_public\_key'. The key is not uploaded or stored. If you're unsure how to create one, check [Generate a SSH Key Pair](https://cloud.ibm.com/docs/powervs-vpc?topic=powervs-vpc-powervs-automation-prereqs#powervs-automation-ssh-key) in our docs. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys) in the VPC docs. | `string` | n/a | yes |
+| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region. If you're unsure how to create one, check [Generate a SSH Key Pair](https://cloud.ibm.com/docs/powervs-vpc?topic=powervs-vpc-powervs-automation-prereqs#powervs-automation-ssh-key) in our docs. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys) in the VPC docs. | `string` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | List of tag names for the IBM Cloud PowerVS workspace | `list(string)` | `[]` | no |
 | <a name="input_transit_gateway_global"></a> [transit\_gateway\_global](#input\_transit\_gateway\_global) | Connect to the networks outside the associated region. | `bool` | `false` | no |
 | <a name="input_user_data"></a> [user\_data](#input\_user\_data) | User data that automatically performs common configuration tasks or runs scripts. For more information, see https://cloud.ibm.com/docs/vpc?topic=vpc-user-data. For information on using the user\_data variable, please refer: https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-user-data | `string` | `null` | no |

modules/powervs-vpc-landing-zone/variables.tf

@@ -35,12 +35,12 @@ variable "vpc_intel_images" {
 }
 
 variable "ssh_public_key" {
-  description = "Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region."
+  description = "Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region. If you're unsure how to create one, check [Generate a SSH Key Pair](https://cloud.ibm.com/docs/powervs-vpc?topic=powervs-vpc-powervs-automation-prereqs#powervs-automation-ssh-key) in our docs. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys) in the VPC docs."
   type        = string
 }
 
 variable "ssh_private_key" {
-  description = "Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh_public_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys)."
+  description = "Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh_public_key'. The key is not uploaded or stored. If you're unsure how to create one, check [Generate a SSH Key Pair](https://cloud.ibm.com/docs/powervs-vpc?topic=powervs-vpc-powervs-automation-prereqs#powervs-automation-ssh-key) in our docs. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys) in the VPC docs."
   type        = string
   sensitive   = true
 }