Merge pull request #17 from IBM-Cloud/ga-release

v1.6.0 - upgrade to symphony 7.3.2

CHANGELOG.md

@@ -1,5 +1,12 @@
 # **CHANGELOG**
 
+## **1.6.0**
+### ENHANCEMENTS
+- Support for Symphony Linux 7.3.2 Build601711 fix patch.
+- Symphony Windows has been updated from version 7.3.1 to 7.3.2 and also have Build601711 fix patch.
+- Spectrum Scale version has been updated from 5.1.7.0 to 5.1.9.0.
+- Symphony Linux OS upgraded from RHEL 8.6 to RHEL 8.8. 
+
 ## **1.5.0**
 ### ENHANCEMENTS
 - Support for persistent storage type for IBM Spectrum Scale deployment on bare metal servers.

README.md

@@ -322,7 +322,7 @@ $ ssh -J root@52.116.122.64 root@10.241.0.20
 | <a name="input_dedicated_host_placement"></a> [dedicated\_host\_placement](#input\_dedicated\_host\_placement) | Specify 'pack' or 'spread'. The 'pack' option will deploy virtual server instances on one dedicated host until full before moving on to the next dedicated host. The 'spread' option will deploy virtual server instances in round-robin fashion across all the dedicated hosts. The second option should result in mostly even distribution of instances on the hosts, while the first option might result in one dedicated host being mostly empty. | `string` | `"spread"` | no |
 | <a name="input_hyperthreading_enabled"></a> [hyperthreading\_enabled](#input\_hyperthreading\_enabled) | Setting this to true will enable hyper-threading in the worker nodes of the cluster(default). Otherwise, hyper-threading will be disabled. | `bool` | `true` | no |
 | <a name="input_ibm_customer_number"></a> [ibm\_customer\_number](#input\_ibm\_customer\_number) | Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn). | `string` | n/a | yes |
-| <a name="input_image_name"></a> [image\_name](#input\_image\_name) | Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the automation uses a base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering. | `string` | `"hpcc-symp732-scale5170-rhel86-v1-5"` | no |
+| <a name="input_image_name"></a> [image\_name](#input\_image\_name) | Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the automation uses a base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering. | `string` | `"hpcc-symp732-scale5190-rhel88-v1-6"` | no |
 | <a name="input_login_node_instance_type"></a> [login\_node\_instance\_type](#input\_login\_node\_instance\_type) | Specify the virtual server instance profile type to be used to create the login node for the Spectrum Symphony cluster. For choices on profile types, see [Instance profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). | `string` | `"bx2-2x8"` | no |
 | <a name="input_management_node_count"></a> [management\_node\_count](#input\_management\_node\_count) | Number of management nodes. This is the total number of primary, secondary and management nodes. There will be one Primary, one Secondary and the rest of the nodes will be management nodes. Enter a value in the range 1 - 10. | `number` | `3` | no |
 | <a name="input_management_node_instance_type"></a> [management\_node\_instance\_type](#input\_management\_node\_instance\_type) | Specify the virtual server instance profile type to be used to create the management nodes for the Spectrum Symphony cluster. For choices on profile types, see [Instance profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). | `string` | `"bx2-4x16"` | no |
@@ -335,7 +335,7 @@ $ ssh -J root@52.116.122.64 root@10.241.0.20
 | <a name="input_scale_storage_cluster_filesystem_mountpoint"></a> [scale\_storage\_cluster\_filesystem\_mountpoint](#input\_scale\_storage\_cluster\_filesystem\_mountpoint) | Spectrum Scale storage cluster (owningCluster) file system mount point. The owningCluster is the cluster that owns and serves the file system to be mounted.  For more information, see [Mounting a remote GPFS file system](https://www.ibm.com/docs/en/spectrum-scale/5.1.5?topic=system-mounting-remote-gpfs-file). | `string` | `"/gpfs/fs1"` | no |
 | <a name="input_scale_storage_cluster_gui_password"></a> [scale\_storage\_cluster\_gui\_password](#input\_scale\_storage\_cluster\_gui\_password) | Password for Spectrum Scale storage cluster GUI. Note: Password should be at least 8 characters, must have one number, one lowercase letter, one uppercase letter, and at least one unique character. Password should not contain username. | `string` | `""` | no |
 | <a name="input_scale_storage_cluster_gui_username"></a> [scale\_storage\_cluster\_gui\_username](#input\_scale\_storage\_cluster\_gui\_username) | GUI user to perform system management\_node and monitoring tasks on storage cluster. Note: Username should be at least 4 characters, any combination of lowercase and uppercase letters. | `string` | `""` | no |
-| <a name="input_scale_storage_image_name"></a> [scale\_storage\_image\_name](#input\_scale\_storage\_image\_name) | Name of the custom image that you would like to use to create virtual machines in your IBM Cloud account to deploy the Spectrum Scale storage cluster. By default, our automation uses a base image plus the Spectrum Scale software and any other software packages that it requires. If you'd like, you can follow the instructions for [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the Spectrum Scale storage cluster through this offering. | `string` | `"hpcc-scale5170-rhel86"` | no |
+| <a name="input_scale_storage_image_name"></a> [scale\_storage\_image\_name](#input\_scale\_storage\_image\_name) | Name of the custom image that you would like to use to create virtual machines in your IBM Cloud account to deploy the Spectrum Scale storage cluster. By default, our automation uses a base image plus the Spectrum Scale software and any other software packages that it requires. If you'd like, you can follow the instructions for [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the Spectrum Scale storage cluster through this offering. | `string` | `"hpcc-scale5190-rhel88"` | no |
 | <a name="input_scale_storage_node_count"></a> [scale\_storage\_node\_count](#input\_scale\_storage\_node\_count) | Total number of storage cluster instances that you need to provision. A minimum of three nodes and a maximum of eighteen nodes are supported if the storage\_type selected is scratch. A minimum of three nodes and a maximum of ten nodes are supported if the storage type selected is persistent. | `number` | `3` | no |
 | <a name="input_scale_storage_node_instance_type"></a> [scale\_storage\_node\_instance\_type](#input\_scale\_storage\_node\_instance\_type) | Specify the virtual server instance storage profile type name to be used to create the Spectrum Scale storage nodes for the Spectrum Symphony cluster. For more information, see [Instance profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). | `string` | `"cx2d-8x16"` | no |
 | <a name="input_spectrum_scale_enabled"></a> [spectrum\_scale\_enabled](#input\_spectrum\_scale\_enabled) | Setting this to 'true' will enable Spectrum Scale integration with the cluster. Otherwise, Spectrum Scale integration will be disabled (default). By entering 'true' for the property you have also agreed to one of the two conditions. 1. You are using the software in production and confirm you have sufficient licenses to cover your use under the International Program License Agreement (IPLA). 2. You are evaluating the software and agree to abide by the International License Agreement for Evaluation of Programs (ILAE). NOTE: Failure to comply with licenses for production use of software is a violation of [IBM International Program License Agreement](https://www.ibm.com/software/passportadvantage/programlicense.html). | `bool` | `false` | no |
@@ -355,7 +355,7 @@ $ ssh -J root@52.116.122.64 root@10.241.0.20
 | <a name="input_vpn_peer_address"></a> [vpn\_peer\_address](#input\_vpn\_peer\_address) | The peer public IP address to which the VPN will be connected. | `string` | `""` | no |
 | <a name="input_vpn_peer_cidrs"></a> [vpn\_peer\_cidrs](#input\_vpn\_peer\_cidrs) | Comma separated list of peer CIDRs (e.g., 192.168.0.0/24) to which the VPN will be connected. | `string` | `""` | no |
 | <a name="input_vpn_preshared_key"></a> [vpn\_preshared\_key](#input\_vpn\_preshared\_key) | The pre-shared key for the VPN. | `string` | `""` | no |
-| <a name="input_windows_image_name"></a> [windows\_image\_name](#input\_windows\_image\_name) | Name of the custom image that you want to use to create Windows® virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the solution uses a base image with additional software packages, which are mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you want to include your application-specific binary files, follow the instructions in [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images&interface=ui) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering. | `string` | `"hpcc-sym731-win2016-10oct22-v1"` | no |
+| <a name="input_windows_image_name"></a> [windows\_image\_name](#input\_windows\_image\_name) | Name of the custom image that you want to use to create Windows® virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the solution uses a base image with additional software packages, which are mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you want to include your application-specific binary files, follow the instructions in [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images&interface=ui) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering. | `string` | `"hpcc-sym732-win2016-v1-1"` | no |
 | <a name="input_windows_worker_node"></a> [windows\_worker\_node](#input\_windows\_worker\_node) | Set to true to deploy Windows® worker nodes in the cluster. By default, the cluster deploys Linux® worker nodes. If the variable is set to true, the values of both worker\_node\_min\_count and worker\_node\_max\_count should be equal because the current implementation doesn't support dynamic creation of worker nodes through Host Factory. | `bool` | `false` | no |
 | <a name="input_worker_node_instance_type"></a> [worker\_node\_instance\_type](#input\_worker\_node\_instance\_type) | Specify the virtual server instance or bare metal server profile type name to be used to create the worker nodes for the Spectrum Symphony cluster based on worker\_node\_type. The worker nodes are the ones where the workload execution takes place and the choice should be made according to the characteristic of workloads. For more information, see [virtual server instance ](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles) and [bare metal server profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-bare-metal-servers-profile&interface=ui). NOTE: If dedicated\_host\_enabled == true, available instance prefix (e.g., bx2 and cx2) can be limited depending on your target region. Check `ibmcloud target -r {region_name}; ibmcloud is dedicated-host-profiles`. | `string` | `"bx2-4x16"` | no |
 | <a name="input_worker_node_max_count"></a> [worker\_node\_max\_count](#input\_worker\_node\_max\_count) | The maximum number of virtual server instance or bare metal server worker nodes that can be provisioned in the cluster. To take advantage of the auto-scale feature from [Host Factory](https://www.ibm.com/docs/en/spectrum-symphony/7.3.1?topic=factory-overview), the value needs to be greater than worker\_node\_min\_count. If using virtual server instances, enter a value in the range 1 - 500. If using bare metal servers, the value needs to match worker\_node\_min\_count, and the permitted value is in the range 1 - 16. Note: If you plan to use Spectrum Scale storage, the value for this parameter should be equal to worker\_node\_min\_count. | `number` | `10` | no |
@@ -372,4 +372,4 @@ $ ssh -J root@52.116.122.64 root@10.241.0.20
 | <a name="output_spectrum_scale_storage_ssh_command"></a> [spectrum\_scale\_storage\_ssh\_command](#output\_spectrum\_scale\_storage\_ssh\_command) | n/a |
 | <a name="output_ssh_command"></a> [ssh\_command](#output\_ssh\_command) | n/a |
 | <a name="output_vpc_name"></a> [vpc\_name](#output\_vpc\_name) | n/a |
-| <a name="output_vpn_config_info"></a> [vpn\_config\_info](#output\_vpn\_config\_info) | n/a |
+| <a name="output_vpn_config_info"></a> [vpn\_config\_info](#output\_vpn\_config\_info) | n/a |

image-map.tf

@@ -5,27 +5,27 @@
 
 locals {
   image_region_map = {
-    "hpcc-symp732-scale5170-rhel86-v1-5" = {
-      "ca-tor"  = "r038-2f38af7d-fe95-47f6-9b74-fb3891976711"
-      "br-sao"  = "r042-549f1984-a34a-4cf8-a02b-e2bc84689d92"
-      "us-east" = "r014-7a55de08-6395-4a72-8676-7945047cda13"
-      "us-south"= "r006-bfaa25a3-43ed-4fba-8488-c9fcdc6d24a6"
-      "jp-osa"  = "r034-f96223fc-8d23-472e-a43e-51fb4c275c33"
-      "jp-tok"  = "r022-3f8eaf0d-1506-4c07-9191-dfb09c7f662e"
-      "au-syd"  = "r026-1aa3139a-c643-4bb1-a5e2-882e3a30b0c7"
-      "eu-de"   = "r010-fd217f16-3f74-4f29-b35f-71b2978e1bc3"
-      "eu-gb"   = "r018-e2869eb3-6b40-468f-b949-9b2da6bc53ac"
+    "hpcc-symp732-scale5190-rhel88-v1-6" = {
+      "ca-tor"  = "r038-d1253b36-da42-4053-9faa-cc0f2b294596"
+      "br-sao"  = "r042-ca8f2d46-0eb0-45b3-b2cd-44d9d27d151c"
+      "us-east" = "r014-6bab86dc-2417-4194-a32d-2a15e426e3d3"
+      "us-south"= "r006-cc1957ce-2a0b-484a-bccc-690dc8ab2491"
+      "jp-osa"  = "r034-af09538b-166f-4bf5-a81e-3b1a20e7fd27"
+      "jp-tok"  = "r022-773ddcf9-ca5d-4200-a7bb-466ada3584ac"
+      "au-syd"  = "r026-71cff7b5-ddc4-40ee-a999-70ff00097f9d"
+      "eu-de"   = "r010-770ae090-d60f-44a9-b985-f7f57386ad6c"
+      "eu-gb"   = "r018-8ed688c9-5c59-45a5-aacb-f586be3b958f"
     },
-    "hpcc-sym731-win2016-10oct22-v1" = {  
-      "ca-tor"  = "r038-74251e18-0a8b-4eea-b4ab-f2a52d3d78c7"
-      "br-sao"  = "r042-25aa73c7-ca44-4aa3-94d6-7f01c3c98804"
-      "us-east" = "r014-d5ee150e-7103-468d-847c-08258b8e16c5"
-      "us-south"= "r006-3f250809-d1b3-4f1c-b629-ce16cfb34e9d" 
-      "jp-osa"  = "r034-c37fef8a-cf0b-415a-b5f0-dad7fbd60b14"
-      "jp-tok"  = "r022-1806238e-107d-4955-a481-153e0cbd8fa9"
-      "au-syd"  = "r026-c1cb73af-b8c6-498c-ba0a-f2acb3f928d1"
-      "eu-de"   = "r010-f49b523f-96bc-413b-b1a0-0f710a7c7c99"
-      "eu-gb"   = "r018-a43cb221-e893-4b2d-af96-c4efb79241a9"
+    "hpcc-sym732-win2016-v1-1" = {  
+      "ca-tor"  = "r038-02785dbe-ac57-4668-b65b-0039960c87af"
+      "br-sao"  = "r042-1d4c4ffc-15a7-4354-bd42-dc8aaa094608"
+      "us-east" = "r014-a26e9cd9-a0f1-4b79-a8b5-da9366c6a430"
+      "us-south"= "r006-29e2c380-19df-4df4-924b-369c4ff65b86" 
+      "jp-osa"  = "r034-c02a64dd-3c08-4085-b34b-f2478b479677"
+      "jp-tok"  = "r022-72297c63-0cca-45c5-8e35-b2b372e77731"
+      "au-syd"  = "r026-770e4fb6-789a-4a91-938c-87416818be65"
+      "eu-de"   = "r010-4505370c-cb3f-4f5b-9154-72599421d0f1"
+      "eu-gb"   = "r018-734839bf-2512-46db-a4f3-9fdc9efa4ba3"
     }
   }
-}  
+}

resources/ibmcloud/compute/bare_metal_server/bare_metal_server.tf

@@ -39,7 +39,7 @@ resource "ibm_is_bare_metal_server" "bare_metal" {
   keys    = var.keys
   tags    = var.tags
   primary_network_interface {
-    name            = "ens1"
+    name            = "eth0"
     subnet          = var.subnet
     security_groups = var.security_group
   }

sample/configs/hpc_workspace_config.json

@@ -69,7 +69,7 @@
         },
         {
           "name": "image_name",
-          "value": "hpcc-symp732-scale5170-rhel86-v1-5",
+          "value": "hpcc-symp732-scale5190-rhel88-v1-6",
           "type": "string",
           "secure": false,
           "description": "Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the automation uses a base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you would like to include your application-specific binary files, follow the instructions in [ Planning for custom images ](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering."
@@ -228,7 +228,7 @@
         },
         {
           "name": "scale_storage_image_name",
-          "value": "hpcc-scale5170-rhel86",
+          "value": "hpcc-scale5190-rhel88",
           "type": "string",
           "secure": false,
           "description": "Name of the custom image that you would like to use to create virtual machines in your IBM Cloud account to deploy the Spectrum Scale storage cluster. By default, our automation uses a base image plus the Spectrum Scale software and any other software packages that it requires. If you'd like, you can follow the instructions for [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the Spectrum Scale storage cluster through this offering."

sample/configs/hpc_workspace_windows_config.json

@@ -199,6 +199,12 @@
             "value": "dnsworker.com",
             "type": "string",
             "description": "IBM Cloud DNS Services domain name to be used for the compute cluster, e.g., test.example.corp."
+          },
+          {
+            "name": "windows_image_name",
+            "value": "hpcc-sym732-win2016-v1-1",
+            "type": "string",
+            "description": "Name of the custom image that you want to use to create Windows® virtual server instances in your IBM Cloud account to deploy the IBM Spectrum Symphony cluster. By default, the solution uses a base image with additional software packages, which are mentioned [here](https://cloud.ibm.com/docs/hpc-spectrum-symphony#create-custom-image). If you want to include your application-specific binary files, follow the instructions in [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images&interface=ui) to create your own custom image and use that to build the IBM Spectrum Symphony cluster through this offering."
           }
         ]
       }