Integration Testing: Sequential Merge and Validation of Four Feature Branches (PR #43,#44, #45,#46)

The purpose of this branch is to facilitate the testing and integration of changes from four separate feature branches:

1. Remove remote-exec provisioners in Terraform script (Merge Request #46): This commit focuses on removing remote-exec provisioners from the Terraform script. By eliminating these provisioners, we aim to enhance the reliability and security of the infrastructure setup.

2. Include mount commands in user_data_script for Terraform instance initialization (Merge Request #45): This merge request introduces mount commands in the user_data_script of the Terraform script. The inclusion of these commands ensures proper initialization of instances by facilitating the mounting of specified devices to relevant directories during the initial boot process. This change enhances the robustness and efficiency of instance initialization procedures.

3. WIP: Feat vol download from s3 (Merge Request #44): This work-in-progress merge request aims to implement functionality for downloading volumes from Amazon S3 (Simple Storage Service) within the Terraform setup. Once completed, this feature will enable the seamless integration of volume download capabilities, enhancing data management and accessibility within the infrastructure.

4. feat: Add new data volume for XDMod queue data (Merge Request #43): This merge request focuses on the addition of a new data volume specifically designed for XDMod queue data. By incorporating this new volume into the infrastructure configuration, we aim to optimize data storage and management processes, thereby improving the overall efficiency and functionality of the system.

ohpc-instance/main.tf

@@ -26,7 +26,10 @@ variable "floating_ip_ohpc" {type = string}
 
 variable "ohpc_user" {}
 variable "ssh_private_key" {}
-variable "vol_id" {}
+variable "vol_ids" {
+  type    = list(string)
+  default = []
+}
 
 # creates details for the OHPC instance
 resource "openstack_compute_instance_v2" "ohpc" {
@@ -73,14 +76,18 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
   instance_id = openstack_compute_instance_v2.ohpc.id
 }
 
-# Attach a volume
-resource "openstack_compute_volume_attach_v2" "volume_attach" {
+# Attach specific volumes
+resource "openstack_compute_volume_attach_v2" "attach_prod_volume" {
   instance_id = openstack_compute_instance_v2.ohpc.id
-  volume_id   = var.vol_id
+  volume_id   = var.data_volume
 }
 
+resource "openstack_compute_volume_attach_v2" "attach_prod_queue_volume" {
+  instance_id = openstack_compute_instance_v2.ohpc.id
+  volume_id   = var.xdmod_queue_data_volume
+}
 output "xdmod_instance_id" {
-    value = openstack_compute_instance_v2.ohpc.id
+  value = openstack_compute_instance_v2.ohpc.id
 }
 
 output "ssh_host" {
@@ -88,5 +95,8 @@ output "ssh_host" {
 }
 
 output "device" {
-    value = openstack_compute_volume_attach_v2.volume_attach.device
+  value = [
+    openstack_compute_volume_attach_v2.attach_prod_volume.device,
+    openstack_compute_volume_attach_v2.attach_prod_queue_volume.device
+  ]
 }