2022 4Q Changes (#13)

alexarvinraj · web-flow · commit 94f1cdcc2340 · 2022-10-28T09:48:56.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # **CHANGELOG**
 
+## **1.3.0**
+### ENHANCEMENTS
+- Support for Windows worker node
+
 ## **1.2.5**
 ### **BUG FIXES**
 - Fixed bug related to instance storage datasource lookup when spectrum scale is disabled.
@@ -62,4 +66,4 @@
 - Avoid terraform warning regarding interpolation
 
 ## **1.0.0**
-- Initial Release
+- Initial Release
diff --git a/DCO1.1_signatures_symphony.txt b/DCO1.1_signatures_symphony.txt
@@ -5,3 +5,4 @@ DCO 1.1 Signed-off-by:  Takeshi Yoshimura <tyos@jp.ibm.com> Date: 09-21-2021
 DCO 1.1 Signed-off-by:  Alex Arvinraj <A.Alex.Arvinraj@ibm.com> Date: 09-20-2021
 DCO 1.1 Signed-off-by:  Ajith Shanmuganathan <ashanmug@ca.ibm.com> Date: 09-20-2021
 DCO 1.1 Signed-off-by:  Saurabh Kumar <saurabh.kumar12@ibm.com> Date: 28-01-2022
+DCO 1.1 Signed-off-by:  Robert Ebenezer Bhakiyaraj S <robert.ebenezer.bhakiyaraj.s@ibm.com> Date: 10-28-2022
diff --git a/README.md b/README.md
diff --git a/image-map.tf b/image-map.tf
@@ -12,6 +12,17 @@ locals {
       "au-syd" = "r026-b58c6aa4-684b-4fe3-817c-32faa3157082"
       "eu-de" = "r010-90a603fa-4881-490d-8d1e-bb9ba127a321"
       "eu-gb" = "r018-c2dc9947-acf0-47a3-bf91-ee73c27b0a66"
+    },
+    "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"
     }
   }
-}
+}  
diff --git a/outputs.tf b/outputs.tf
@@ -25,4 +25,4 @@ output "region_name" {
 
 output "image_map_entry_found" {
   value = "${local.image_mapping_entry_found} --  - ${var.image_name}"
-}
+}
diff --git a/provider.tf b/provider.tf
@@ -8,11 +8,11 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.41.0"
+      version = "1.46.0"
     }
     http = {
       source = "hashicorp/http"
-      version = "3.0.1"
+      version = "3.1.0"
     }
   }
 }
diff --git a/resources/scale_common/ansible_compute_playbook/ansible_compute_playbook.tf b/resources/scale_common/ansible_compute_playbook/ansible_compute_playbook.tf
@@ -145,4 +145,4 @@ resource "null_resource" "call_scale_install_playbook" {
   triggers = {
     build = timestamp()
   }
-}
+}
diff --git a/resources/scale_common/ansible_remote_mount_playbook/ansible_remote_mount_playbook.tf b/resources/scale_common/ansible_remote_mount_playbook/ansible_remote_mount_playbook.tf
@@ -98,4 +98,4 @@ resource "null_resource" "call_remote_mnt_playbook" {
   triggers = {
     builds = timestamp()
   }
-}
+}
diff --git a/resources/windows/security_group_rules/security_group_rules.tf b/resources/windows/security_group_rules/security_group_rules.tf
@@ -0,0 +1,37 @@
+/*
+    This module used for creating security group rules for symphony windows
+*/
+
+terraform {
+  required_providers {
+    ibm = {
+      source = "IBM-Cloud/ibm"
+    }
+  }
+}
+
+variable "remote_allowed_ips"{}
+variable "security_group" {}  
+
+#Enable below security group to allow RDP to windows worker nodes
+resource "ibm_is_security_group_rule" "ingress_tcp_windows_rdp" {
+  count = length(var.remote_allowed_ips)
+  group     = var.security_group
+  direction = "inbound"
+  remote    = var.remote_allowed_ips[count.index]
+  tcp {
+    port_min = 3389
+    port_max = 3389
+  }
+}
+
+resource "ibm_is_security_group_rule" "ingress_udp_windows_rdp" {
+  count = length(var.remote_allowed_ips)
+  group     = var.security_group
+  direction = "inbound"
+  remote    = var.remote_allowed_ips[count.index]
+  udp {
+    port_min = 3389
+    port_max = 3389
+  }
+}
diff --git a/sample/configs/hpc_workspace_config.json b/sample/configs/hpc_workspace_config.json
@@ -173,11 +173,11 @@
           "description": "True to enable hyper-threading in the cluster nodes (default). Otherwise, hyper-threading will be disabled. Note: Do not set hyper-threading to false. An issue with the RHEL 8.4 image related to that setting has been identified that impacts this release. See [FAQ](https://cloud.ibm.com/docs/hpc-spectrum-symphony?topic=hpc-spectrum-symphony-spectrum-symphony-faqs&interface=ui)."
         },
         {
-          "name": "ssh_allowed_ips",
-          "value": "",
-          "type": "string",
+          "name": "remote_allowed_ips",
+          "value": "[\"Please fill here\"]",
+          "type": "list(string)",
           "secure": false,
-          "description": "Comma separated list of IP addresses that can access the Spectrum Symphony instance through SSH interface. The default value allows any IP address to access the cluster."
+          "description": "Comma-separated list of IP addresses that can access the Spectrum Symphony instance through an SSH/RDP interface. For security purposes, provide the public IP addresses assigned to the devices that are authorized to establish SSH/RDP connections (for example, [\"169.45.117.34\"]). To fetch the IP address of the device, use [https://ipv4.icanhazip.com/](https://ipv4.icanhazip.com/)."
         },
         {
           "name": "vpn_enabled",
diff --git a/sample/configs/hpc_workspace_windows_config.json b/sample/configs/hpc_workspace_windows_config.json
@@ -0,0 +1,183 @@
+{
+    "name": "hpcc-symphony-windows-test",
+    "type": [
+      "terraform_v1.1"
+    ],
+    "location": "us-east",
+    "resource_group": "Default",
+    "description": "",
+    "tags": ["hpcc", "symphony"],
+    "template_repo": {
+      "url": "https://github.com/IBM-Cloud/hpc-cluster-symphony"
+    },
+    "template_data": [
+      {
+        "folder": ".",
+        "type": "terraform_v1.1",
+        "env_values":[
+          { 
+            "TF_CLI_ARGS_apply": "-parallelism=250"
+          },
+          { 
+            "TF_CLI_ARGS_plan": "-parallelism=250"
+          },
+          {
+            "TF_CLI_ARGS_destroy": "-parallelism=100"
+          },
+          {
+            "VAR1":"<val1>"
+          },
+          {
+            "VAR2":"<val2>"
+          } 
+        ],
+        "variablestore": [
+          {
+            "name": "cluster_prefix",
+            "value": "hpcc-symphony-windows",
+            "type": "string",
+            "secure": false,
+            "description": "Prefix that is used to name the Spectrum Symphony cluster and IBM Cloud resources that are provisioned to build the Spectrum Symphony cluster instance. You cannot create more than one instance of the Symphony cluster with the same name. Make sure that the name is unique. Enter a prefix name, such as my-hpcc."
+          },
+          {
+            "name": "cluster_id",
+            "value": "HpccTest",
+            "type": "string",
+            "secure": false,
+            "description": "ID of the cluster used by Symphony for configuration of resources. Post deployment the value can be verified using command `egosh ego info`."
+          },
+          {
+            "name": "vpc_name",
+            "value": "",
+            "type": "string",
+            "secure": false,
+            "description": "Name of an existing VPC in which the cluster resources will be deployed. If no value is given, then a new VPC will be provisioned for the cluster. [Learn more](https://cloud.ibm.com/docs/vpc)"
+          },
+          {
+            "name": "resource_group",
+            "value": "Default",
+            "type": "string",
+            "secure": false,
+            "description":"Resource group name from your IBM Cloud account where the VPC resources should be deployed. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs)."
+          },
+          {
+            "name": "zone",
+            "value": "Please fill here",
+            "type": "string",
+            "secure": false,
+            "description": "IBM Cloud zone name within the selected region where the Spectrum Symphony cluster should be deployed. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli)."
+          },
+          {
+            "name": "storage_node_instance_type",
+            "value": "bx2-2x8",
+            "type": "string",
+            "secure": false,
+            "description": "Specify the virtual server instance profile type to be used to create the storage node for the Spectrum Symphony cluster. The storage node is the one that is used to create an NFS instance to manage the data for HPC workloads. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles)."
+          },
+          {
+            "name": "worker_node_instance_type",
+            "value": "bx2-4x16",
+            "type": "string",
+            "secure": false,
+            "description": "Specify the virtual server instance profile type name to be used to create the worker nodes for the Spectrum Symphony cluster. The worker nodes are the ones where the workload execution takes place and the choice should be made according to the characteristic of workloads. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). 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`."
+          },
+          {
+            "name": "management_node_instance_type",
+            "value": "bx2-4x16",
+            "type": "string",
+            "secure": false,
+            "description": "Specify the virtual server instance profile type name to be used to create the management nodes for the Spectrum Symphony cluster. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles)."
+          },
+          {
+            "name": "login_node_instance_type",
+            "value": "bx2-2x8",
+            "type": "string",
+            "secure": false,
+            "description": "Specify the virtual server instance profile type name to be used to create the login node for the Spectrum Symphony cluster. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles)."
+          },
+          {
+            "name": "management_node_count",
+            "value": "3",
+            "type": "number",
+            "secure": false,
+            "description": "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."
+          },
+          {
+            "name": "worker_node_max_count",
+            "value": "2",
+            "type": "number",
+            "secure": false,
+            "description": "The maximum number of worker nodes that can be deployed in the Spectrum Symphony cluster. In order to use the [Host Factory](https://www.ibm.com/docs/en/spectrum-symphony/7.3.1?topic=factory-overview) feature to dynamically create and delete worker nodes based on workload demand, the value selected for this parameter must be larger than worker_node_min_count. If you plan to deploy only static worker nodes in the Spectrum Symphony cluster, e.g., when using Spectrum Scale storage, the value for this parameter should be equal to worker_node_min_count. Enter a value in the range 1 - 500."
+          },
+          {
+            "name": "worker_node_min_count",
+            "value": "2",
+            "type": "number",
+            "secure": false,
+            "description": "The minimum number of worker nodes. This is the number of static worker nodes that will be provisioned at the time the cluster is created. If using NFS storage, enter a value in the range 0 - 500. If using Spectrum Scale storage, enter a value in the range 1 - 64. NOTE: Spectrum Scale requires a minimum of 3 compute nodes (combination of primary, secondary, management, and worker nodes) to establish a [quorum](https://www.ibm.com/docs/en/spectrum-scale/5.1.2?topic=failure-quorum#nodequo) and maintain data consistency in the even of a node failure. Therefore, the minimum value of 1 may need to be larger if the value specified for management_node_count is less than 2."
+          },
+          {
+            "name": "windows_worker_node",
+            "value": "true",
+            "type": "string",
+            "secure": false,
+            "description": "Set to true to deploy windows worker nodes in cluster and by default cluster will deploy linux worker nodes. If this variable is set to true, current implementation doesn't support dynamic creation of worker nodes thru host factory. So, the values of both 'worker_node_min_count' and 'worker_node_max_count' should be equal."
+          },
+          {
+            "name": "ssh_key_name",
+            "value": "Please fill here",
+            "type": "string",
+            "secure": false,
+            "description":"Comma-separated list of names of the SSH key configured in your IBM Cloud account that is used to establish a connection to the Symphony primary node. Ensure the SSH key is present in the same resource group and region where the cluster is being provisioned. If you do not have an SSH key in your IBM Cloud account, create one by using the instructions given here. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys)."
+          },
+          {
+            "name": "api_key",
+            "value": "Please fill here",
+            "type": "string",
+            "secure": true,
+            "description": "This is the API key for IBM Cloud account in which the Spectrum Symphony cluster needs to be deployed. [Learn more](https://cloud.ibm.com/docs/account?topic=account-userapikey)."
+          },
+          {
+            "name": "sym_license_confirmation",
+            "value": "true",
+            "type": "string",
+            "secure": false,
+            "description": "Confirm your use of IBM Spectrum Symphony licenses. By entering 'true' for the property you have 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. [Learn more](https://www.ibm.com/software/passportadvantage/programlicense.html)."
+          },
+          {
+            "name": "hyperthreading_enabled",
+            "value": "true",
+            "type": "bool",
+            "secure": false,
+            "description": "True to enable hyper-threading in the cluster nodes (default). Otherwise, hyper-threading will be disabled. Note: Do not set hyper-threading to false. An issue with the RHEL 8.4 image related to that setting has been identified that impacts this release. See [FAQ](https://cloud.ibm.com/docs/hpc-spectrum-symphony?topic=hpc-spectrum-symphony-spectrum-symphony-faqs&interface=ui)."
+          },
+          {
+            "name": "remote_allowed_ips",
+            "value": "[\"Please fill here\"]",
+            "type": "list(string)",
+            "secure": false,
+            "description": "Comma-separated list of IP addresses that can access the Spectrum Symphony instance through an SSH/RDP interface. For security purposes, provide the public IP addresses assigned to the devices that are authorized to establish SSH/RDP connections (for example, [\"169.45.117.34\"]). To fetch the IP address of the device, use [https://ipv4.icanhazip.com/](https://ipv4.icanhazip.com/)."
+          },
+          {
+            "name": "dedicated_host_enabled",
+            "value": "false",
+            "type": "bool",
+            "description": "Set to true to use dedicated hosts for compute hosts (default: false). Note that Symphony still dynamically provisions compute hosts at public VSIs and dedicated hosts are used only for static compute hosts provisioned at the time the cluster is created. The number of dedicated hosts are calculated from worker_node_min_count and dedicated_host_profile."
+          },
+          {
+            "name": "dedicated_host_placement",
+            "value": "spread",
+            "type": "string",
+            "description": "Specify 'pack' or 'spread'. The 'pack' option will deploy VSIson one dedicated host until full before moving on to the next dedicated host. The 'spread' option will deploy VSIs in round-robin fashion across all the dedicated hosts. The second option should result in mostly even distribution of VSIs on the hosts, while the first option could result in one dedicated host being mostly empty."
+          },
+          {
+            "name": "TF_WAIT_DURATION",
+            "value": "180s",
+            "type": "string",
+            "description": "wait duration time set for the storage and worker node to complete the entire setup"
+          }
+        ]
+      }
+    ]
+  }
+  
diff --git a/scripts/user_data_input_management_node.tpl b/scripts/user_data_input_management_node.tpl
@@ -27,3 +27,6 @@ egoHostRole="${ego_host_role}"
 cluster_cidr="${cluster_cidr}"
 spectrum_scale="${spectrum_scale}"
 temp_public_key="${temp_public_key}"
+windows_worker_node="${windows_worker_node}"
+EgoUserName="${EgoUserName}"
+EgoPassword="${EgoPassword}"
diff --git a/scripts/user_data_input_primary.tpl b/scripts/user_data_input_primary.tpl
@@ -40,3 +40,6 @@ hyperthreading="${hyperthreading}"
 cluster_cidr="${cluster_cidr}"
 spectrum_scale="${spectrum_scale}"
 temp_public_key="${temp_public_key}"
+windows_worker_node="${windows_worker_node}"
+EgoUserName="${EgoUserName}"
+EgoPassword="${EgoPassword}"
diff --git a/scripts/user_data_input_storage.tpl b/scripts/user_data_input_storage.tpl
@@ -16,4 +16,4 @@ echo START `date '+%Y-%m-%d %H:%M:%S'`
 
 #input parameters
 hf_cidr_block="${hf_cidr_block}"
-spectrum_scale="${spectrum_scale}"
+spectrum_scale="${spectrum_scale}"
diff --git a/scripts/user_data_input_worker.tpl b/scripts/user_data_input_worker.tpl
@@ -23,3 +23,6 @@ cluster_cidr="${cluster_cidr}"
 hf_cidr_block="${cluster_cidr}"
 spectrum_scale="${spectrum_scale}"
 temp_public_key="${temp_public_key}"
+windows_worker_node="${windows_worker_node}"
+EgoUserName="${EgoUserName}"
+EgoPassword="${EgoPassword}"
diff --git a/scripts/user_data_spectrum_storage.tpl b/scripts/user_data_spectrum_storage.tpl
@@ -22,4 +22,4 @@ hyperthreading="${hyperthreading}"
 cluster_cidr="${cluster_cidr}"
 egoHostRole="${ego_host_role}"
 spectrum_scale="${spectrum_scale}"
-temp_public_key="${temp_public_key}"
+temp_public_key="${temp_public_key}"
diff --git a/scripts/user_data_storage.sh b/scripts/user_data_storage.sh
@@ -7,13 +7,13 @@ SHARED_TOP=/data
 
 env
 
-#Update Master host name based on internal IP address
+#Update management_node host name based on internal IP address
 privateIP=$(ip addr show eth0 | awk '$1 == "inet" {gsub(/\/.*$/, "", $2); print $2}')
 hostName=ibm-gen2host-${privateIP//./-}
 hostnamectl set-hostname ${hostName}
 
 # NOTE: On ibm gen2, the default DNS server do not have reverse hostname/IP resolution.
-# 1) put the master server hostname and ip into hosts.
+# 1) put the management_node server hostname and ip into hosts.
 # 2) put all possible VMs' hostname and ip into hosts.
 python -c "import ipaddress; print('\n'.join([str(ip) + ' ibm-gen2host-' + str(ip).replace('.', '-') for ip in ipaddress.IPv4Network(bytearray('${hf_cidr_block}'))]))" >> /etc/hosts
 
diff --git a/scripts/user_data_symphony.sh b/scripts/user_data_symphony.sh
diff --git a/scripts/windows_worker_user_data.ps1 b/scripts/windows_worker_user_data.ps1
diff --git a/variables.tf b/variables.tf
diff --git a/vpc.tf b/vpc.tf

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ terraform {`
`8`	`8`	`required_providers {`
`9`	`9`	`ibm = {`
`10`	`10`	`source = "IBM-Cloud/ibm"`
`11`		`- version = "1.41.0"`
	`11`	`+ version = "1.46.0"`
`12`	`12`	`}`
`13`	`13`	`http = {`
`14`	`14`	`source = "hashicorp/http"`
`15`		`- version = "3.0.1"`
	`15`	`+ version = "3.1.0"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,4 +145,4 @@ resource "null_resource" "call_scale_install_playbook" {`
`145`	`145`	`triggers = {`
`146`	`146`	`build = timestamp()`
`147`	`147`	`}`
`148`		`-}`
	`148`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -98,4 +98,4 @@ resource "null_resource" "call_remote_mnt_playbook" {`
`98`	`98`	`triggers = {`
`99`	`99`	`builds = timestamp()`
`100`	`100`	`}`
`101`		`-}`
	`101`	`+}`